@fluidframework/tree 2.90.0-378676 → 2.91.0

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

@@ -132,7 +132,6 @@ export const EncodedModularChangesetV1 = Type.Object(
 		// This can lead to a less efficient wire representation because of duplicated schema/shape information.
 		builds: Type.Optional(EncodedBuilds),
 		refreshers: Type.Optional(EncodedBuilds),
-
 		/**
 		 * The number of constraints within this changeset that are violated.
 		 */

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

@@ -9,7 +9,7 @@ import { EncodedModularChangesetV1 } from "./modularChangeFormatV1.js";
 
 const noAdditionalProps: ObjectOptions = { additionalProperties: false };
 
-export const EncodedNoChangeConstraint = Type.Object(
+const EncodedNoChangeConstraint = Type.Object(
 	{
 		violated: Type.Boolean(),
 	},

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

@@ -6,9 +6,7 @@
 import {
 	subtractChangeAtomIds,
 	type ChangeAtomId,
-	type ChangeAtomIdRangeMap,
 	type ChangesetLocalId,
-	type EditorOptions,
 	type FieldKey,
 	type FieldKindIdentifier,
 	type RevisionInfo,
@@ -17,13 +15,9 @@ import { brand, RangeMap, type Brand } from "../../util/index.js";
 import type { ChangeAtomIdBTree } from "../changeAtomIdBTree.js";
 import type { TreeChunk } from "../chunked-forest/index.js";
 
-import type { NodeMoveType } from "./crossFieldQueries.js";
-
-export type RebaseVersion = 1 | 2;
+import type { CrossFieldTarget } from "./crossFieldQueries.js";
 
 export interface ModularChangeset extends HasFieldChanges {
-	readonly rebaseVersion: RebaseVersion;
-
 	/**
 	 * The numerically highest `ChangesetLocalId` used in this changeset.
 	 * If undefined then this changeset contains no IDs.
@@ -41,14 +35,12 @@ export interface ModularChangeset extends HasFieldChanges {
 	 * Maps from this changeset's canonical ID for a node (see comment on node aliases) to the changes for that node.
 	 */
 	readonly nodeChanges: ChangeAtomIdBTree<NodeChangeset>;
-	readonly rootNodes: RootNodeTable;
 
 	/**
-	 * Maps from this changeset's canonical ID for a node to the ID for the field which contains that node,
-	 * or the detach ID, if this node is detached.
+	 * Maps from this changeset's canonical ID for a node to the ID for the field which contains that node.
 	 */
 	// TODO: Should this be merged with `nodeChanges`?
-	readonly nodeToParent: ChangeAtomIdBTree<NodeLocation>;
+	readonly nodeToParent: ChangeAtomIdBTree<FieldId>;
 
 	/**
 	 * Maps from a node ID to another ID for the same node.
@@ -82,31 +74,10 @@ export interface ModularChangeset extends HasFieldChanges {
 	readonly refreshers?: ChangeAtomIdBTree<TreeChunk>;
 }
 
-export interface RootNodeTable {
-	// TODO: Include builds, destroys, refreshers, and field changes
-	readonly oldToNewId: ChangeAtomIdRangeMap<ChangeAtomId>;
-	readonly newToOldId: ChangeAtomIdRangeMap<ChangeAtomId>;
-	readonly nodeChanges: ChangeAtomIdBTree<NodeId>;
-
-	/**
-	 * Maps from input context detach ID to the field where the node was last attached.
-	 * There should be an entry for every detach ID referenced in `oldToNewId` or `nodeChanges`.
-	 */
-	readonly detachLocations: ChangeAtomIdRangeMap<FieldId>;
+export type CrossFieldKeyTable = RangeMap<CrossFieldKey, FieldId>;
 
-	/**
-	 * Maps from the output root ID of a node to the output detach location of that node.
-	 * This is only guaranteed to contain entries for nodes which have an output detach location
-	 * which is different from their location in the input context.
-	 */
-	readonly outputDetachLocations: ChangeAtomIdRangeMap<FieldId>;
-}
-
-export type CrossFieldRangeTable<T> = RangeMap<CrossFieldKey, T>;
-export type CrossFieldKeyTable = CrossFieldRangeTable<FieldId>;
-
-export function newCrossFieldRangeTable<V>(): CrossFieldRangeTable<V> {
-	return new RangeMap<CrossFieldKey, V>(offsetCrossFieldKey, subtractCrossFieldKeys);
+export function newCrossFieldKeyTable(): CrossFieldKeyTable {
+	return new RangeMap(offsetCrossFieldKey, subtractCrossFieldKeys);
 }
 
 function offsetCrossFieldKey(key: CrossFieldKey, offset: number): CrossFieldKey {
@@ -126,7 +97,7 @@ function subtractCrossFieldKeys(a: CrossFieldKey, b: CrossFieldKey): number {
 }
 
 export interface CrossFieldKey extends ChangeAtomId {
-	readonly target: NodeMoveType;
+	readonly target: CrossFieldTarget;
 }
 
 export interface CrossFieldKeyRange {
@@ -139,24 +110,6 @@ export interface FieldId {
 	readonly field: FieldKey;
 }
 
-export interface FieldParent {
-	readonly field: FieldId;
-	readonly root?: undefined;
-}
-
-export interface RootParent {
-	readonly field?: undefined;
-	readonly root: ChangeAtomId;
-}
-
-export type NodeLocation = FieldParent | RootParent;
-export interface DetachLocation {
-	readonly field: FieldId;
-	readonly atomId: ChangeAtomId | undefined;
-}
-
-/**
- */
 export interface NodeExistsConstraint {
 	violated: boolean;
 }
@@ -173,16 +126,15 @@ export interface NoChangeConstraint {
  */
 export interface NodeChangeset extends HasFieldChanges {
 	/** Keeps track of whether node exists constraint has been violated by this change */
-	readonly nodeExistsConstraint?: NodeExistsConstraint;
-
+	nodeExistsConstraint?: NodeExistsConstraint;
 	/** Keeps track of whether node exists constraint will be violated when this change is reverted */
-	readonly nodeExistsConstraintOnRevert?: NodeExistsConstraint;
+	nodeExistsConstraintOnRevert?: NodeExistsConstraint;
 }
 
 export type NodeId = ChangeAtomId;
 
 export interface HasFieldChanges {
-	readonly fieldChanges?: FieldChangeMap;
+	fieldChanges?: FieldChangeMap;
 }
 
 export type FieldChangeMap = Map<FieldKey, FieldChange>;
@@ -193,7 +145,3 @@ export interface FieldChange {
 }
 
 export type FieldChangeset = Brand<unknown, "FieldChangeset">;
-
-export interface ModularEditorOptions extends EditorOptions {
-	readonly rebaseVersionOverride?: RebaseVersion;
-}