@fluidframework/tree 2.74.0 → 2.81.0-374083

package/lib/feature-libraries/schemaChecker.js.map

@@ -1 +1 @@
-{"version":3,"file":"schemaChecker.js","sourceRoot":"","sources":["../../src/feature-libraries/schemaChecker.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 { unreachableCase, fail } from \"@fluidframework/core-utils/internal\";\nimport { UsageError } from \"@fluidframework/telemetry-utils/internal\";\n\nimport {\n\ttype TreeFieldStoredSchema,\n\tLeafNodeStoredSchema,\n\tObjectNodeStoredSchema,\n\tMapNodeStoredSchema,\n\tMultiplicity,\n\ttype SchemaAndPolicy,\n} from \"../core/index.js\";\nimport { allowsValue } from \"./valueUtilities.js\";\nimport type { MapTreeFieldViewGeneric, MinimalMapTreeNodeView } from \"./mapTreeCursor.js\";\nimport { iterableHasSome, mapIterable } from \"../util/index.js\";\n\nexport enum SchemaValidationError {\n\tField_KindNotInSchemaPolicy,\n\tField_MissingRequiredChild,\n\tField_MultipleChildrenNotAllowed,\n\tField_ChildInForbiddenField,\n\tField_NodeTypeNotAllowed,\n\tLeafNode_InvalidValue,\n\tLeafNode_FieldsNotAllowed,\n\tObjectNode_FieldNotInSchema,\n\tNonLeafNode_ValueNotAllowed,\n\tNode_MissingSchema,\n}\n\n/**\n * Throws a UsageError indicating a tree is out of schema.\n */\nexport function throwOutOfSchema(maybeError: SchemaValidationError): never {\n\tthrow new UsageError(\n\t\t`Tree does not conform to schema: ${SchemaValidationError[maybeError]}`,\n\t);\n}\n\ntype NotUndefined = number | string | boolean | bigint | symbol | object;\n\n/**\n * Deeply checks that the provided node complies with the schema based on its identifier.\n *\n * @param onError - Called with the first error (if any).\n *\n * @returns the return value from `onError` if the node or anything inside of it is out of schema, otherwise `undefined`.\n */\nexport function isNodeInSchema<T extends NotUndefined>(\n\tnode: MinimalMapTreeNodeView,\n\tschemaAndPolicy: SchemaAndPolicy,\n\tonError: (error: SchemaValidationError) => T,\n): T | undefined {\n\t// Validate the schema declared by the node exists\n\tconst schema = schemaAndPolicy.schema.nodeSchema.get(node.type);\n\tif (schema === undefined) {\n\t\treturn onError(SchemaValidationError.Node_MissingSchema);\n\t}\n\n\t// Validate the node is well formed according to its schema\n\n\tif (schema instanceof LeafNodeStoredSchema) {\n\t\tif (iterableHasSome(node.fields)) {\n\t\t\treturn onError(SchemaValidationError.LeafNode_FieldsNotAllowed);\n\t\t}\n\t\tif (!allowsValue(schema.leafValue, node.value)) {\n\t\t\treturn onError(SchemaValidationError.LeafNode_InvalidValue);\n\t\t}\n\t} else {\n\t\tif (node.value !== undefined) {\n\t\t\treturn onError(SchemaValidationError.NonLeafNode_ValueNotAllowed);\n\t\t}\n\n\t\tif (schema instanceof ObjectNodeStoredSchema) {\n\t\t\tconst uncheckedFieldsFromNode = new Set(mapIterable(node.fields, ([key, field]) => key));\n\t\t\tfor (const [fieldKey, fieldSchema] of schema.objectNodeFields) {\n\t\t\t\tconst nodeField = node.fields.get(fieldKey) ?? [];\n\t\t\t\tconst fieldInSchemaResult = isFieldInSchema(\n\t\t\t\t\tnodeField,\n\t\t\t\t\tfieldSchema,\n\t\t\t\t\tschemaAndPolicy,\n\t\t\t\t\tonError,\n\t\t\t\t);\n\t\t\t\tif (fieldInSchemaResult !== undefined) {\n\t\t\t\t\treturn fieldInSchemaResult;\n\t\t\t\t}\n\t\t\t\tuncheckedFieldsFromNode.delete(fieldKey);\n\t\t\t}\n\t\t\t// The node has fields that we did not check as part of looking at every field defined in the node's schema.\n\t\t\t// Since this is testing compatibility with a stored schema (not view schema), \"allowUnknownOptionalFields\" does not exist at this layer.\n\t\t\t// Code using this with a stored schema derived from a view schema rather than the document can be problematic because it may be missing unknown fields that the actual document has.\n\t\t\t// Other schema evolution features like \"staged\" allowed types will likely cause similar issues elsewhere in this checker.\n\t\t\tif (uncheckedFieldsFromNode.size !== 0) {\n\t\t\t\treturn onError(SchemaValidationError.ObjectNode_FieldNotInSchema);\n\t\t\t}\n\t\t} else if (schema instanceof MapNodeStoredSchema) {\n\t\t\tfor (const [_key, field] of node.fields) {\n\t\t\t\tconst fieldInSchemaResult = isFieldInSchema(\n\t\t\t\t\tfield,\n\t\t\t\t\tschema.mapFields,\n\t\t\t\t\tschemaAndPolicy,\n\t\t\t\t\tonError,\n\t\t\t\t);\n\t\t\t\tif (fieldInSchemaResult !== undefined) {\n\t\t\t\t\treturn fieldInSchemaResult;\n\t\t\t\t}\n\t\t\t}\n\t\t} else {\n\t\t\tfail(0xb0e /* Unknown TreeNodeStoredSchema type */);\n\t\t}\n\t}\n\n\treturn undefined;\n}\n\n/**\n * Deeply checks that the nodes comply with the field schema and included schema.\n *\n * @param onError - Called with the first error (if any).\n *\n * @returns the return value from `onError` if the field or anything inside of it is out of schema, otherwise `undefined`.\n */\nexport function isFieldInSchema<T extends NotUndefined>(\n\tchildNodes: MapTreeFieldViewGeneric<MinimalMapTreeNodeView>,\n\tschema: TreeFieldStoredSchema,\n\tschemaAndPolicy: SchemaAndPolicy,\n\tonError: (error: SchemaValidationError) => T,\n): T | undefined {\n\t// Validate that the field kind is handled by the schema policy\n\tconst kind = schemaAndPolicy.policy.fieldKinds.get(schema.kind);\n\tif (kind === undefined) {\n\t\treturn onError(SchemaValidationError.Field_KindNotInSchemaPolicy);\n\t}\n\n\t// Validate that the field doesn't contain more nodes than its type supports\n\t{\n\t\tconst multiplicityCheck = compliesWithMultiplicity(childNodes.length, kind.multiplicity);\n\t\tif (multiplicityCheck !== undefined) {\n\t\t\treturn onError(multiplicityCheck);\n\t\t}\n\t}\n\n\tfor (const node of childNodes) {\n\t\t// Validate the type declared by the node is allowed in this field\n\t\tif (schema.types !== undefined && !schema.types.has(node.type)) {\n\t\t\treturn onError(SchemaValidationError.Field_NodeTypeNotAllowed);\n\t\t}\n\n\t\t// Validate the node complies with the type it declares to be.\n\t\tconst nodeInSchemaResult = isNodeInSchema(node, schemaAndPolicy, onError);\n\t\tif (nodeInSchemaResult !== undefined) {\n\t\t\treturn nodeInSchemaResult;\n\t\t}\n\t}\n\n\treturn undefined;\n}\n\n/**\n * Validates that a given number of items complies with the specified {@link Multiplicity | multiplicity}.\n * @param numberOfItems - Number of items.\n * @param multiplicity - Kind of multiplicity to validate against.\n * @returns `true` if the specified number of items complies with the specified multiplicity; otherwise, `false`.\n */\nexport function compliesWithMultiplicity(\n\tnumberOfItems: number,\n\tmultiplicity: Multiplicity,\n): SchemaValidationError | undefined {\n\tswitch (multiplicity) {\n\t\tcase Multiplicity.Single:\n\t\t\tif (numberOfItems < 1) {\n\t\t\t\treturn SchemaValidationError.Field_MissingRequiredChild;\n\t\t\t} else if (numberOfItems > 1) {\n\t\t\t\treturn SchemaValidationError.Field_MultipleChildrenNotAllowed;\n\t\t\t} else {\n\t\t\t\treturn undefined;\n\t\t\t}\n\t\tcase Multiplicity.Optional:\n\t\t\treturn numberOfItems > 1\n\t\t\t\t? SchemaValidationError.Field_MultipleChildrenNotAllowed\n\t\t\t\t: undefined;\n\t\tcase Multiplicity.Sequence:\n\t\t\treturn undefined;\n\t\tcase Multiplicity.Forbidden:\n\t\t\treturn numberOfItems === 0\n\t\t\t\t? undefined\n\t\t\t\t: SchemaValidationError.Field_ChildInForbiddenField;\n\t\tdefault:\n\t\t\tunreachableCase(multiplicity);\n\t}\n}\n"]}
+{"version":3,"file":"schemaChecker.js","sourceRoot":"","sources":["../../src/feature-libraries/schemaChecker.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 { unreachableCase, fail } from \"@fluidframework/core-utils/internal\";\nimport { UsageError } from \"@fluidframework/telemetry-utils/internal\";\n\nimport {\n\ttype TreeFieldStoredSchema,\n\tLeafNodeStoredSchema,\n\tObjectNodeStoredSchema,\n\tMapNodeStoredSchema,\n\tMultiplicity,\n\ttype SchemaAndPolicy,\n} from \"../core/index.js\";\nimport { allowsValue } from \"./valueUtilities.js\";\nimport type { MapTreeFieldViewGeneric, MinimalMapTreeNodeView } from \"./mapTreeCursor.js\";\nimport { iterableHasSome, mapIterable } from \"../util/index.js\";\n\nexport enum SchemaValidationError {\n\tField_KindNotInSchemaPolicy,\n\tField_MissingRequiredChild,\n\tField_MultipleChildrenNotAllowed,\n\tField_ChildInForbiddenField,\n\tField_NodeTypeNotAllowed,\n\tLeafNode_InvalidValue,\n\tLeafNode_FieldsNotAllowed,\n\tObjectNode_FieldNotInSchema,\n\tNonLeafNode_ValueNotAllowed,\n\tNode_MissingSchema,\n}\n\n/**\n * Throws a UsageError indicating a tree is out of schema.\n */\nexport function throwOutOfSchema(maybeError: SchemaValidationError): never {\n\tthrow new UsageError(\n\t\t`Tree does not conform to schema: ${SchemaValidationError[maybeError]}`,\n\t);\n}\n\ntype NotUndefined = number | string | boolean | bigint | symbol | object;\n\n/**\n * Deeply checks that the provided node complies with the schema based on its identifier.\n *\n * @param onError - Called with the first error (if any).\n *\n * @returns the return value from `onError` if the node or anything inside of it is out of schema, otherwise `undefined`.\n */\nexport function isNodeInSchema<T extends NotUndefined>(\n\tnode: MinimalMapTreeNodeView,\n\tschemaAndPolicy: SchemaAndPolicy,\n\tonError: (error: SchemaValidationError) => T,\n): T | undefined {\n\t// Validate the schema declared by the node exists\n\tconst schema = schemaAndPolicy.schema.nodeSchema.get(node.type);\n\tif (schema === undefined) {\n\t\treturn onError(SchemaValidationError.Node_MissingSchema);\n\t}\n\n\t// Validate the node is well formed according to its schema\n\n\tif (schema instanceof LeafNodeStoredSchema) {\n\t\tif (iterableHasSome(node.fields)) {\n\t\t\treturn onError(SchemaValidationError.LeafNode_FieldsNotAllowed);\n\t\t}\n\t\tif (!allowsValue(schema.leafValue, node.value)) {\n\t\t\treturn onError(SchemaValidationError.LeafNode_InvalidValue);\n\t\t}\n\t} else {\n\t\tif (node.value !== undefined) {\n\t\t\treturn onError(SchemaValidationError.NonLeafNode_ValueNotAllowed);\n\t\t}\n\n\t\tif (schema instanceof ObjectNodeStoredSchema) {\n\t\t\tconst uncheckedFieldsFromNode = new Set(mapIterable(node.fields, ([key, field]) => key));\n\t\t\tfor (const [fieldKey, fieldSchema] of schema.objectNodeFields) {\n\t\t\t\tconst nodeField = node.fields.get(fieldKey) ?? [];\n\t\t\t\tconst fieldInSchemaResult = isFieldInSchema(\n\t\t\t\t\tnodeField,\n\t\t\t\t\tfieldSchema,\n\t\t\t\t\tschemaAndPolicy,\n\t\t\t\t\tonError,\n\t\t\t\t);\n\t\t\t\tif (fieldInSchemaResult !== undefined) {\n\t\t\t\t\treturn fieldInSchemaResult;\n\t\t\t\t}\n\t\t\t\tuncheckedFieldsFromNode.delete(fieldKey);\n\t\t\t}\n\t\t\t// The node has fields that we did not check as part of looking at every field defined in the node's schema.\n\t\t\t// Since this is testing compatibility with a stored schema (not view schema), \"allowUnknownOptionalFields\" does not exist at this layer.\n\t\t\t// Code using this with a stored schema derived from a view schema rather than the document can be problematic because it may be missing unknown fields that the actual document has.\n\t\t\t// Other schema evolution features like \"staged\" allowed types will likely cause similar issues elsewhere in this checker.\n\t\t\tif (uncheckedFieldsFromNode.size > 0) {\n\t\t\t\treturn onError(SchemaValidationError.ObjectNode_FieldNotInSchema);\n\t\t\t}\n\t\t} else if (schema instanceof MapNodeStoredSchema) {\n\t\t\tfor (const [_key, field] of node.fields) {\n\t\t\t\tconst fieldInSchemaResult = isFieldInSchema(\n\t\t\t\t\tfield,\n\t\t\t\t\tschema.mapFields,\n\t\t\t\t\tschemaAndPolicy,\n\t\t\t\t\tonError,\n\t\t\t\t);\n\t\t\t\tif (fieldInSchemaResult !== undefined) {\n\t\t\t\t\treturn fieldInSchemaResult;\n\t\t\t\t}\n\t\t\t}\n\t\t} else {\n\t\t\tfail(0xb0e /* Unknown TreeNodeStoredSchema type */);\n\t\t}\n\t}\n\n\treturn undefined;\n}\n\n/**\n * Deeply checks that the nodes comply with the field schema and included schema.\n *\n * @param onError - Called with the first error (if any).\n *\n * @returns the return value from `onError` if the field or anything inside of it is out of schema, otherwise `undefined`.\n */\nexport function isFieldInSchema<T extends NotUndefined>(\n\tchildNodes: MapTreeFieldViewGeneric<MinimalMapTreeNodeView>,\n\tschema: TreeFieldStoredSchema,\n\tschemaAndPolicy: SchemaAndPolicy,\n\tonError: (error: SchemaValidationError) => T,\n): T | undefined {\n\t// Validate that the field kind is handled by the schema policy\n\tconst kind = schemaAndPolicy.policy.fieldKinds.get(schema.kind);\n\tif (kind === undefined) {\n\t\treturn onError(SchemaValidationError.Field_KindNotInSchemaPolicy);\n\t}\n\n\t// Validate that the field doesn't contain more nodes than its type supports\n\t{\n\t\tconst multiplicityCheck = compliesWithMultiplicity(childNodes.length, kind.multiplicity);\n\t\tif (multiplicityCheck !== undefined) {\n\t\t\treturn onError(multiplicityCheck);\n\t\t}\n\t}\n\n\tfor (const node of childNodes) {\n\t\t// Validate the type declared by the node is allowed in this field\n\t\tif (schema.types !== undefined && !schema.types.has(node.type)) {\n\t\t\treturn onError(SchemaValidationError.Field_NodeTypeNotAllowed);\n\t\t}\n\n\t\t// Validate the node complies with the type it declares to be.\n\t\tconst nodeInSchemaResult = isNodeInSchema(node, schemaAndPolicy, onError);\n\t\tif (nodeInSchemaResult !== undefined) {\n\t\t\treturn nodeInSchemaResult;\n\t\t}\n\t}\n\n\treturn undefined;\n}\n\n/**\n * Validates that a given number of items complies with the specified {@link Multiplicity | multiplicity}.\n * @param numberOfItems - Number of items.\n * @param multiplicity - Kind of multiplicity to validate against.\n * @returns `true` if the specified number of items complies with the specified multiplicity; otherwise, `false`.\n */\nexport function compliesWithMultiplicity(\n\tnumberOfItems: number,\n\tmultiplicity: Multiplicity,\n): SchemaValidationError | undefined {\n\tswitch (multiplicity) {\n\t\tcase Multiplicity.Single: {\n\t\t\tif (numberOfItems < 1) {\n\t\t\t\treturn SchemaValidationError.Field_MissingRequiredChild;\n\t\t\t} else if (numberOfItems > 1) {\n\t\t\t\treturn SchemaValidationError.Field_MultipleChildrenNotAllowed;\n\t\t\t} else {\n\t\t\t\treturn undefined;\n\t\t\t}\n\t\t}\n\t\tcase Multiplicity.Optional: {\n\t\t\treturn numberOfItems > 1\n\t\t\t\t? SchemaValidationError.Field_MultipleChildrenNotAllowed\n\t\t\t\t: undefined;\n\t\t}\n\t\tcase Multiplicity.Sequence: {\n\t\t\treturn undefined;\n\t\t}\n\t\tcase Multiplicity.Forbidden: {\n\t\t\treturn numberOfItems === 0\n\t\t\t\t? undefined\n\t\t\t\t: SchemaValidationError.Field_ChildInForbiddenField;\n\t\t}\n\t\tdefault: {\n\t\t\tunreachableCase(multiplicity);\n\t\t}\n\t}\n}\n"]}

package/lib/feature-libraries/sequence-field/compose.d.ts

@@ -4,9 +4,8 @@
  */
 import { type RevisionMetadataSource } from "../../core/index.js";
 import type { IdAllocator } from "../../util/index.js";
-import { type CrossFieldManager, type NodeChangeComposer } from "../modular-schema/index.js";
-import { type MoveEffectTable } from "./moveEffectTable.js";
-import { type Changeset, type Mark } from "./types.js";
+import type { ComposeNodeManager, NodeChangeComposer } from "../modular-schema/index.js";
+import type { Changeset, Mark } from "./types.js";
 /**
  * Composes a sequence of changesets into a single changeset.
  * @param changes - The changesets to be applied.
@@ -19,7 +18,7 @@ import { type Changeset, type Mark } from "./types.js";
  * - Support for moves is not implemented.
  * - Support for slices is not implemented.
  */
-export declare function compose(change1: Changeset, change2: Changeset, composeChild: NodeChangeComposer, _genId: IdAllocator, manager: CrossFieldManager, revisionMetadata: RevisionMetadataSource): Changeset;
+export declare function compose(change1: Changeset, change2: Changeset, composeChild: NodeChangeComposer, _genId: IdAllocator, manager: ComposeNodeManager, revisionMetadata: RevisionMetadataSource): Changeset;
 export declare class ComposeQueue {
     private readonly moveEffects;
     private readonly revisionMetadata;
@@ -27,7 +26,7 @@ export declare class ComposeQueue {
     private readonly newMarks;
     private readonly baseMarksCellSources;
     private readonly newMarksCellSources;
-    constructor(baseMarks: Changeset, newMarks: Changeset, moveEffects: MoveEffectTable, revisionMetadata: RevisionMetadataSource);
+    constructor(baseMarks: Changeset, newMarks: Changeset, moveEffects: ComposeNodeManager, revisionMetadata: RevisionMetadataSource);
     isEmpty(): boolean;
     pop(): ComposeMarks;
     private dequeueBase;
@@ -36,8 +35,8 @@ export declare class ComposeQueue {
     private peekMinLength;
 }
 interface ComposeMarks {
-    baseMark?: Mark;
-    newMark?: Mark;
+    baseMark: Mark;
+    newMark: Mark;
 }
 export {};
 //# sourceMappingURL=compose.d.ts.map

package/lib/feature-libraries/sequence-field/compose.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/compose.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAEN,KAAK,sBAAsB,EAG3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EACN,KAAK,iBAAiB,EAEtB,KAAK,kBAAkB,EAEvB,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EAEN,KAAK,eAAe,EAQpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAGN,KAAK,SAAS,EAEd,KAAK,IAAI,EAMT,MAAM,YAAY,CAAC;AA6BpB;;;;;;;;;;;GAWG;AACH,wBAAgB,OAAO,CACtB,OAAO,EAAE,SAAS,EAClB,OAAO,EAAE,SAAS,EAClB,YAAY,EAAE,kBAAkB,EAChC,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,iBAAiB,EAC1B,gBAAgB,EAAE,sBAAsB,GACtC,SAAS,CAQX;AAuZD,qBAAa,YAAY;IASvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IATlC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAY;IACrC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAuC;IAC5E,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAuC;gBAG1E,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,SAAS,EACF,WAAW,EAAE,eAAe,EAC5B,gBAAgB,EAAE,sBAAsB;IAQnD,OAAO,IAAI,OAAO;IAIlB,GAAG,IAAI,YAAY;IAqD1B,OAAO,CAAC,WAAW;IAWnB,OAAO,CAAC,UAAU;IAUlB,OAAO,CAAC,WAAW;IAiBnB,OAAO,CAAC,aAAa;CAUrB;AAED,UAAU,YAAY;IACrB,QAAQ,CAAC,EAAE,IAAI,CAAC;IAChB,OAAO,CAAC,EAAE,IAAI,CAAC;CACf"}
+{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/compose.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAIN,KAAK,sBAAsB,EAE3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EACX,kBAAkB,EAClB,kBAAkB,EAElB,MAAM,4BAA4B,CAAC;AAKpC,OAAO,KAAK,EAEX,SAAS,EAET,IAAI,EAIJ,MAAM,YAAY,CAAC;AA2BpB;;;;;;;;;;;GAWG;AACH,wBAAgB,OAAO,CACtB,OAAO,EAAE,SAAS,EAClB,OAAO,EAAE,SAAS,EAClB,YAAY,EAAE,kBAAkB,EAChC,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,kBAAkB,EAC3B,gBAAgB,EAAE,sBAAsB,GACtC,SAAS,CAEX;AAsND,qBAAa,YAAY;IASvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IATlC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAY;IACrC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAuC;IAC5E,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAuC;gBAG1E,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,SAAS,EACF,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,EAAE,sBAAsB;IAanD,OAAO,IAAI,OAAO;IAIlB,GAAG,IAAI,YAAY;IAyD1B,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,UAAU;IAUlB,OAAO,CAAC,WAAW;IAiBnB,OAAO,CAAC,aAAa;CAUrB;AAED,UAAU,YAAY;IACrB,QAAQ,EAAE,IAAI,CAAC;IACf,OAAO,EAAE,IAAI,CAAC;CACd"}

package/lib/feature-libraries/sequence-field/compose.js

@@ -3,13 +3,10 @@
  * Licensed under the MIT License.
  */
 import { assert, unreachableCase, fail } from "@fluidframework/core-utils/internal";
-import { offsetChangeAtomId, } from "../../core/index.js";
-import { CrossFieldTarget, } from "../modular-schema/index.js";
+import { areEqualChangeAtomIdOpts, areEqualChangeAtomIds, } from "../../core/index.js";
 import { MarkListFactory } from "./markListFactory.js";
 import { MarkQueue } from "./markQueue.js";
-import { getCrossFieldTargetFromMove, getMoveEffect, getMoveIn, isMoveIn, isMoveMark, isMoveOut, setMoveEffect, } from "./moveEffectTable.js";
-import { NoopMarkType, } from "./types.js";
-import { CellOrder, areEqualCellIds, areInputCellsEmpty, areOutputCellsEmpty, asAttachAndDetach, cellSourcesFromMarks, compareCellPositionsUsingTombstones, extractMarkEffect, getEndpoint, getInputCellId, getOutputCellId, isAttach, isAttachAndDetachEffect, isDetach, isImpactfulCellRename, isNewAttach, isNoopMark, isRename, markEmptiesCells, markFillsCells, markHasCellEffect, normalizeCellRename, settleMark, withNodeChange, withRevision, } from "./utils.js";
+import { CellOrder, areEqualCellIds, areInputCellsEmpty, areOutputCellsEmpty, cellSourcesFromMarks, compareCellPositionsUsingTombstones, extractMarkEffect, getAttachedRootId, getDetachOutputCellId, getDetachedRootId, getInputCellId, getMovedNodeId, getOutputCellId, isAttach, isDetach, isNewAttach, isNoopMark, isPin, isRename, markEmptiesCells, markHasCellEffect, normalizeCellRename, withNodeChange, } from "./utils.js";
 /**
  * Composes a sequence of changesets into a single changeset.
  * @param changes - The changesets to be applied.
@@ -30,26 +27,8 @@ function composeMarkLists(baseMarkList, newMarkList, composeChild, moveEffects,
     const queue = new ComposeQueue(baseMarkList, newMarkList, moveEffects, revisionMetadata);
     while (!queue.isEmpty()) {
         const { baseMark, newMark } = queue.pop();
-        if (newMark === undefined) {
-            assert(baseMark !== undefined, 0x4db /* Non-empty queue should not return two undefined marks */);
-            factory.push(composeMark(baseMark, moveEffects, (node) => composeChildChanges(node, undefined, composeChild)));
-        }
-        else {
-            // We only compose changesets that will not be further rebased.
-            // It is therefore safe to remove any intentions that have no impact in the context they apply to.
-            const settledNewMark = settleMark(newMark);
-            if (baseMark === undefined) {
-                factory.push(composeMark(settledNewMark, moveEffects, (node) => composeChildChanges(undefined, node, composeChild)));
-            }
-            else {
-                // Past this point, we are guaranteed that `settledNewMark` and `baseMark` have the same length and
-                // start at the same location in the revision after the base changes.
-                // They therefore refer to the same range for that revision.
-                const settledBaseMark = settleMark(baseMark);
-                const composedMark = composeMarks(settledBaseMark, settledNewMark, composeChild, moveEffects);
-                factory.push(composedMark);
-            }
-        }
+        const composedMark = composeMarks(baseMark, newMark, composeChild, moveEffects);
+        factory.push(composedMark);
     }
     return factory.list;
 }
@@ -64,128 +43,64 @@ function composeMarkLists(baseMarkList, newMarkList, composeChild, moveEffects,
  */
 function composeMarks(baseMark, newMark, composeChild, moveEffects) {
     const nodeChange = handleNodeChanges(baseMark, newMark, composeChild, moveEffects);
-    return withUpdatedEndpoint(withNodeChange(composeMarksIgnoreChild(baseMark, newMark, moveEffects), nodeChange), baseMark.count, moveEffects);
+    return withNodeChange(composeMarksIgnoreChild(baseMark, newMark, moveEffects), nodeChange);
 }
 function composeMarksIgnoreChild(baseMark, newMark, moveEffects) {
     if (isNoopMark(baseMark)) {
         return newMark;
     }
     else if (isNoopMark(newMark)) {
-        return baseMark;
+        return updateBaseMarkId(moveEffects, baseMark);
     }
     if (isRename(baseMark) && isRename(newMark)) {
+        if (areEqualChangeAtomIdOpts(baseMark.cellId, newMark.idOverride)) {
+            return createNoopMark(baseMark.count, undefined, baseMark.cellId);
+        }
         return { ...baseMark, idOverride: newMark.idOverride };
     }
     else if (isRename(baseMark)) {
-        assert(isAttach(newMark) || isAttachAndDetachEffect(newMark), 0x9f1 /* Unexpected mark type */);
+        assert(isAttach(newMark), 0x9f1 /* Unexpected mark type */);
+        assert(baseMark.cellId !== undefined && newMark.cellId !== undefined, "Expected marks to target an empty cell");
         return { ...newMark, cellId: baseMark.cellId };
     }
     else if (isRename(newMark)) {
-        assert(isDetach(baseMark) || isAttachAndDetachEffect(baseMark), 0x9f2 /* Unexpected mark type */);
-        return isDetach(baseMark)
-            ? { ...baseMark, idOverride: newMark.idOverride }
-            : { ...baseMark, detach: { ...baseMark.detach, idOverride: newMark.idOverride } };
-    }
-    if (isImpactfulCellRename(newMark)) {
-        const newAttachAndDetach = asAttachAndDetach(newMark);
-        assert(newAttachAndDetach.cellId !== undefined, 0x9f3 /* Impactful cell rename must target empty cell */);
-        const newDetachRevision = newAttachAndDetach.detach.revision;
-        if (markEmptiesCells(baseMark)) {
-            // baseMark is a detach which cancels with the attach portion of the AttachAndDetach,
-            // so we are just left with the detach portion of the AttachAndDetach.
-            const newDetach = {
-                ...newAttachAndDetach.detach,
-                count: baseMark.count,
-            };
-            if (isMoveIn(newAttachAndDetach.attach) && isMoveOut(newAttachAndDetach.detach)) {
-                assert(isMoveOut(baseMark), 0x808 /* Unexpected mark type */);
-                // The base changeset and new changeset both move these nodes.
-                // Call the original position of the nodes A, the position after the base changeset is applied B,
-                // and the position after the new changeset is applied C.
-                // The new changeset moves the nodes from B, temporarily returns them to A, and then moves them to C.
-                // The composition of the base and new changesets will be a move directly from A to C,
-                // since the move from A to B cancels out with the return from B to A.
-                // This if-block is handling marks at A.
-                // When we compose the marks at B we will link the start of the base move (A to B)
-                // with the end of the new move (B to C).
-                // Because we are replacing the mark representing the start of the move with the new changeset's
-                // move-out from A, we update the base move-in at B to consider that its start point.
-                const newDetachId = {
-                    revision: newDetachRevision,
-                    localId: newAttachAndDetach.detach.id,
-                };
-                setTruncatedEndpointForInner(moveEffects, CrossFieldTarget.Destination, getEndpoint(baseMark), baseMark.count, newDetachId);
-                const newEndpoint = getComposedEndpoint(moveEffects, CrossFieldTarget.Source, baseMark.revision, baseMark.id, baseMark.count);
-                if (newEndpoint !== undefined) {
-                    changeFinalEndpoint(newDetach, newEndpoint);
-                    setTruncatedEndpoint(moveEffects, CrossFieldTarget.Destination, newEndpoint, baseMark.count, newDetachId);
-                }
-            }
-            return newDetach;
-        }
-        if (isImpactfulCellRename(baseMark)) {
-            assert(baseMark.cellId !== undefined, 0x9f4 /* Impactful cell rename must target empty cell */);
-            const baseAttachAndDetach = asAttachAndDetach(baseMark);
-            const newOutputId = getOutputCellId(newAttachAndDetach);
-            const originalAttach = { ...baseAttachAndDetach.attach };
-            const finalDetach = { ...newAttachAndDetach.detach };
-            handleMovePivot(baseMark.count, originalAttach, finalDetach, moveEffects);
-            if (areEqualCellIds(newOutputId, baseAttachAndDetach.cellId)) {
-                return { count: baseAttachAndDetach.count, cellId: baseAttachAndDetach.cellId };
-            }
-            // `newMark`'s attach portion cancels with `baseMark`'s detach portion.
-            const detachRevision = finalDetach.revision;
-            if (detachRevision !== undefined) {
-                finalDetach.revision = detachRevision;
+        assert(isDetach(baseMark), 0x9f2 /* Unexpected mark type */);
+        return updateBaseMarkId(moveEffects, { ...baseMark, cellRename: newMark.idOverride });
+    }
+    if (!markHasCellEffect(baseMark)) {
+        assert(baseMark.type === "Insert", "Expected baseMark to be a pin");
+        // `newMark` can be either a remove or another pin.
+        // A pin is treated as a detach and attach, so we call `composeAttachDetach` in either case.
+        moveEffects.composeAttachDetach(getAttachedRootId(baseMark), {
+            revision: newMark.revision,
+            localId: newMark.id,
+        }, baseMark.count);
+        const pinId = getAttachedRootId(baseMark);
+        return newMark.type === "Remove"
+            ? {
+                ...newMark,
+                detachCellId: baseMark.detachCellId ?? pinId,
+                cellRename: getDetachOutputCellId(newMark),
             }
-            return normalizeCellRename(baseMark.cellId, baseMark.count, originalAttach, finalDetach);
-        }
-        return normalizeCellRename(newAttachAndDetach.cellId, newAttachAndDetach.count, newAttachAndDetach.attach, newAttachAndDetach.detach);
-    }
-    if (isImpactfulCellRename(baseMark)) {
-        const baseAttachAndDetach = asAttachAndDetach(baseMark);
-        if (markFillsCells(newMark)) {
-            const originalAttach = withRevision({
-                ...baseAttachAndDetach.attach,
-                cellId: baseAttachAndDetach.cellId,
-                count: baseAttachAndDetach.count,
-            }, baseAttachAndDetach.attach.revision);
-            if (isMoveIn(baseAttachAndDetach.attach) && isMoveOut(baseAttachAndDetach.detach)) {
-                assert(isMoveIn(newMark), 0x809 /* Unexpected mark type */);
-                const originalAttachId = {
-                    revision: baseAttachAndDetach.attach.revision,
-                    localId: baseAttachAndDetach.attach.id,
-                };
-                setTruncatedEndpointForInner(moveEffects, CrossFieldTarget.Source, getEndpoint(newMark), baseAttachAndDetach.count, originalAttachId);
-                const newEndpoint = getComposedEndpoint(moveEffects, CrossFieldTarget.Destination, newMark.revision, newMark.id, newMark.count);
-                if (newEndpoint !== undefined) {
-                    changeFinalEndpoint(originalAttach, newEndpoint);
-                    setTruncatedEndpoint(moveEffects, CrossFieldTarget.Source, newEndpoint, baseMark.count, originalAttachId);
-                }
-            }
-            return originalAttach;
-        }
-        else {
-            // Other mark types have been handled by previous conditional branches.
-            assert(newMark.type === NoopMarkType, 0x80a /* Unexpected mark type */);
-            return baseMark;
-        }
-    }
-    if (!markHasCellEffect(baseMark) && !markHasCellEffect(newMark)) {
-        return createNoopMark(newMark.count, undefined, getInputCellId(baseMark));
-    }
-    else if (!markHasCellEffect(baseMark)) {
-        return newMark;
+            : newMark;
     }
     else if (!markHasCellEffect(newMark)) {
-        return baseMark;
+        if (isAttach(newMark) && isAttach(baseMark)) {
+            // When composing two inserts, the second insert (which is a pin) should take precedence.
+            // We treat the pin as a detach and reattach.
+            moveEffects.composeAttachDetach(getAttachedRootId(baseMark), getAttachedRootId(newMark), baseMark.count);
+            const composed = { cellId: baseMark.cellId, ...newMark };
+            delete composed.detachCellId;
+            return composed;
+        }
+        return updateBaseMarkId(moveEffects, baseMark);
     }
     else if (areInputCellsEmpty(baseMark)) {
         assert(isDetach(newMark), 0x71c /* Unexpected mark type */);
         assert(isAttach(baseMark), 0x71d /* Expected generative mark */);
         const attach = extractMarkEffect(baseMark);
         const detach = extractMarkEffect(newMark);
-        handleMovePivot(baseMark.count, attach, detach, moveEffects);
+        moveEffects.composeAttachDetach(getAttachedRootId(baseMark), getDetachedRootId(newMark), baseMark.count);
         if (areEqualCellIds(getOutputCellId(newMark), baseMark.cellId)) {
             // The output and input cell IDs are the same, so this mark has no effect.
             return { count: baseMark.count, cellId: baseMark.cellId };
@@ -193,37 +108,38 @@ function composeMarksIgnoreChild(baseMark, newMark, moveEffects) {
         return normalizeCellRename(baseMark.cellId, baseMark.count, attach, detach);
     }
     else {
-        const length = baseMark.count;
-        return createNoopMark(length, undefined);
+        assert(baseMark.type === "Remove", "Unexpected mark type");
+        assert(newMark.type === "Insert", "Unexpected mark type");
+        const detachId = getDetachedRootId(baseMark);
+        const attachId = getAttachedRootId(newMark);
+        // Note that we cannot assert that this returns true,
+        // as it may not be until a second pass that MCF can tell that this is a reattach of the same node.
+        moveEffects.composeDetachAttach(detachId, attachId, baseMark.count, true);
+        // The composition has no net effect but we preserve the second change's intention to pin the nodes here.
+        const composedMark = { ...newMark };
+        delete composedMark.cellId;
+        const baseDetachCellId = baseMark.detachCellId ?? detachId;
+        if (!areEqualChangeAtomIds(baseDetachCellId, attachId)) {
+            composedMark.detachCellId = baseDetachCellId;
+        }
+        return composedMark;
     }
 }
-/**
- * Checks if `baseAttach` and `newDetach` are both moves, and if so updates their move endpoints as appropriate,
- * and removes their `finalEndpoint` endpoint fields. Note that can mutate `baseAttach` and `newDetach`.
- * If the effects are not both moves this function does nothing.
- * @param count - The number of cells targeted
- * @param baseAttach - The base attach effect at this location
- * @param newDetach - The new detach effect at this location
- */
-function handleMovePivot(count, baseAttach, newDetach, moveEffects) {
-    if (isMoveIn(baseAttach) && isMoveOut(newDetach)) {
-        const finalSource = getEndpoint(baseAttach);
-        const finalDest = getEndpoint(newDetach);
-        setEndpoint(moveEffects, CrossFieldTarget.Source, finalSource, count, finalDest);
-        const truncatedEndpoint1 = getTruncatedEndpointForInner(moveEffects, CrossFieldTarget.Destination, baseAttach.revision, baseAttach.id, count);
-        if (truncatedEndpoint1 !== undefined) {
-            setTruncatedEndpoint(moveEffects, CrossFieldTarget.Destination, finalDest, count, truncatedEndpoint1);
-        }
-        setEndpoint(moveEffects, CrossFieldTarget.Destination, finalDest, count, finalSource);
-        const truncatedEndpoint2 = getTruncatedEndpointForInner(moveEffects, CrossFieldTarget.Source, newDetach.revision, newDetach.id, count);
-        if (truncatedEndpoint2 !== undefined) {
-            setTruncatedEndpoint(moveEffects, CrossFieldTarget.Source, finalSource, count, truncatedEndpoint2);
+function updateBaseMarkId(moveEffects, baseMark) {
+    if (isDetach(baseMark)) {
+        const baseDetachId = getDetachedRootId(baseMark);
+        const updatedDetachId = getUpdatedDetachId(moveEffects, baseMark);
+        if (updatedDetachId !== undefined &&
+            !areEqualChangeAtomIds(updatedDetachId, baseDetachId)) {
+            return {
+                ...baseMark,
+                revision: updatedDetachId.revision,
+                id: updatedDetachId.localId,
+                detachCellId: baseMark.detachCellId ?? baseDetachId,
+            };
         }
-        // The `finalEndpoint` field of AttachAndDetach move effect pairs is not used,
-        // so we remove it as a normalization.
-        delete baseAttach.finalEndpoint;
-        delete newDetach.finalEndpoint;
     }
+    return baseMark;
 }
 function createNoopMark(length, nodeChange, cellId) {
     const mark = { count: length };
@@ -237,14 +153,13 @@ function createNoopMark(length, nodeChange, cellId) {
     return mark;
 }
 function handleNodeChanges(baseMark, newMark, composeChild, moveEffects) {
-    if (newMark.changes !== undefined) {
-        const baseSource = getMoveIn(baseMark);
-        // TODO: Make sure composeChild is not called twice on the node changes.
-        if (baseSource !== undefined) {
-            setModifyAfter(moveEffects, getEndpoint(baseSource), newMark.changes);
-            return undefined;
-        }
+    if (newMark.changes !== undefined &&
+        baseMark.type === "Insert" &&
+        baseMark.cellId !== undefined) {
+        moveEffects.sendNewChangesToBaseSourceLocation(getAttachedRootId(baseMark), newMark.changes);
+        return undefined;
     }
+    // TODO: Make sure composeChild is not called twice on the node changes.
     return composeChildChanges(baseMark.changes, newMark.changes, composeChild);
 }
 function composeChildChanges(baseChange, newChange, composeChild) {
@@ -253,17 +168,15 @@ function composeChildChanges(baseChange, newChange, composeChild) {
     }
     return composeChild(baseChange, newChange);
 }
-function composeMark(mark, moveEffects, composeChild) {
-    const nodeChanges = mark.changes !== undefined ? composeChild(mark.changes) : undefined;
-    const updatedMark = withUpdatedEndpoint(mark, mark.count, moveEffects);
-    return withNodeChange(updatedMark, nodeChanges);
-}
 export class ComposeQueue {
     constructor(baseMarks, newMarks, moveEffects, revisionMetadata) {
         this.moveEffects = moveEffects;
         this.revisionMetadata = revisionMetadata;
-        this.baseMarks = new MarkQueue(baseMarks, moveEffects);
-        this.newMarks = new MarkQueue(newMarks, moveEffects);
+        const queryFunc = (mark) => isDetach(mark) || isPin(mark)
+            ? moveEffects.getNewChangesForBaseDetach(getMovedNodeId(mark), mark.count).length
+            : mark.count;
+        this.baseMarks = new MarkQueue(baseMarks, queryFunc);
+        this.newMarks = new MarkQueue(newMarks, (mark) => mark.count);
         this.baseMarksCellSources = cellSourcesFromMarks(baseMarks, getOutputCellId);
         this.newMarksCellSources = cellSourcesFromMarks(newMarks, getInputCellId);
     }
@@ -274,7 +187,7 @@ export class ComposeQueue {
         const baseMark = this.baseMarks.peek();
         const newMark = this.newMarks.peek();
         if (baseMark === undefined && newMark === undefined) {
-            return {};
+            fail("Should not pop when queue is empty");
         }
         else if (baseMark === undefined) {
             return this.dequeueNew();
@@ -296,14 +209,18 @@ export class ComposeQueue {
             assert(newCellId !== undefined, 0x89d /* Both marks should have cell IDs */);
             const comparison = compareCellPositionsUsingTombstones(baseCellId, newCellId, this.baseMarksCellSources, this.newMarksCellSources, this.revisionMetadata);
             switch (comparison) {
-                case CellOrder.SameCell:
+                case CellOrder.SameCell: {
                     return this.dequeueBoth();
-                case CellOrder.OldThenNew:
+                }
+                case CellOrder.OldThenNew: {
                     return this.dequeueBase();
-                case CellOrder.NewThenOld:
+                }
+                case CellOrder.NewThenOld: {
                     return this.dequeueNew();
-                default:
+                }
+                default: {
                     unreachableCase(comparison);
+                }
             }
         }
         else if (areOutputCellsEmpty(baseMark)) {
@@ -319,9 +236,6 @@ export class ComposeQueue {
     dequeueBase(length = Number.POSITIVE_INFINITY) {
         const baseMark = this.baseMarks.dequeueUpTo(length);
         const movedChanges = getMovedChangesFromMark(this.moveEffects, baseMark);
-        if (movedChanges !== undefined) {
-            this.moveEffects.onMoveIn(movedChanges);
-        }
         const newMark = createNoopMark(baseMark.count, movedChanges, getOutputCellId(baseMark));
         return { baseMark, newMark };
     }
@@ -355,100 +269,14 @@ export class ComposeQueue {
     }
 }
 function getMovedChangesFromMark(moveEffects, markEffect) {
-    if (isAttachAndDetachEffect(markEffect)) {
-        return getMovedChangesFromMark(moveEffects, markEffect.detach);
-    }
-    if (!isMoveOut(markEffect)) {
+    if (!isDetach(markEffect)) {
         return undefined;
     }
-    return getModifyAfter(moveEffects, markEffect.revision, markEffect.id);
-}
-// It is expected that the range from `id` to `id + count - 1` has the same move effect.
-// The call sites to this function are making queries about a mark which has already been split by a `MarkQueue`
-// to match the ranges in `moveEffects`.
-// TODO: Reduce the duplication between this and other MoveEffect helpers
-function getModifyAfter(moveEffects, revision, id) {
-    const target = CrossFieldTarget.Source;
-    const effect = getMoveEffect(moveEffects, target, revision, id, 1);
-    if (effect.value?.modifyAfter !== undefined) {
-        return effect.value.modifyAfter;
-    }
-    return undefined;
-}
-// TODO: Reduce the duplication between this and other MoveEffect helpers
-function setModifyAfter(moveEffects, { revision, localId: id }, modifyAfter) {
-    const target = CrossFieldTarget.Source;
-    const count = 1;
-    const effect = getMoveEffect(moveEffects, target, revision, id, count, false);
-    const newEffect = effect.value !== undefined ? { ...effect.value, modifyAfter } : { modifyAfter };
-    setMoveEffect(moveEffects, target, revision, id, count, newEffect);
-}
-function setEndpoint(moveEffects, target, id, count, endpoint) {
-    const effect = getMoveEffect(moveEffects, target, id.revision, id.localId, count, false);
-    const newEffect = effect.value !== undefined ? { ...effect.value, endpoint } : { endpoint };
-    setMoveEffect(moveEffects, target, id.revision, id.localId, effect.length, newEffect);
-    const remainingCount = count - effect.length;
-    if (remainingCount > 0) {
-        setEndpoint(moveEffects, target, offsetChangeAtomId(id, effect.length), remainingCount, offsetChangeAtomId(endpoint, effect.length));
-    }
-}
-function setTruncatedEndpoint(moveEffects, target, id, count, truncatedEndpoint) {
-    const effect = getMoveEffect(moveEffects, target, id.revision, id.localId, count);
-    const newEffect = effect.value !== undefined
-        ? { ...effect.value, truncatedEndpoint }
-        : { truncatedEndpoint };
-    setMoveEffect(moveEffects, target, id.revision, id.localId, effect.length, newEffect);
-    const remainingCount = count - effect.length;
-    if (remainingCount > 0) {
-        setTruncatedEndpoint(moveEffects, target, offsetChangeAtomId(id, effect.length), remainingCount, offsetChangeAtomId(truncatedEndpoint, effect.length));
-    }
-}
-function setTruncatedEndpointForInner(moveEffects, target, id, count, truncatedEndpointForInner) {
-    const effect = getMoveEffect(moveEffects, target, id.revision, id.localId, count);
-    const newEffect = effect.value !== undefined
-        ? { ...effect.value, truncatedEndpointForInner }
-        : { truncatedEndpointForInner };
-    setMoveEffect(moveEffects, target, id.revision, id.localId, effect.length, newEffect);
-    const remainingCount = count - effect.length;
-    if (remainingCount > 0) {
-        setTruncatedEndpointForInner(moveEffects, target, offsetChangeAtomId(id, effect.length), remainingCount, offsetChangeAtomId(truncatedEndpointForInner, effect.length));
-    }
-}
-function withUpdatedEndpoint(mark, count, effects) {
-    if (isAttachAndDetachEffect(mark)) {
-        return {
-            ...mark,
-            attach: withUpdatedEndpoint(mark.attach, count, effects),
-            detach: withUpdatedEndpoint(mark.detach, count, effects),
-        };
-    }
-    if (!isMoveMark(mark)) {
-        return mark;
-    }
-    const finalDest = getComposedEndpoint(effects, getCrossFieldTargetFromMove(mark), mark.revision, mark.id, count);
-    if (finalDest === undefined) {
-        return mark;
-    }
-    const output = { ...mark };
-    changeFinalEndpoint(output, finalDest);
-    return output;
-}
-function changeFinalEndpoint(mark, endpoint) {
-    if (areEqualCellIds(endpoint, { revision: mark.revision, localId: mark.id })) {
-        delete mark.finalEndpoint;
-    }
-    else {
-        mark.finalEndpoint = endpoint;
-    }
-}
-function getComposedEndpoint(moveEffects, target, revision, id, count) {
-    const effect = getMoveEffect(moveEffects, target, revision, id, count);
-    assert(effect.length === count, 0x815 /* Expected effect to cover entire mark */);
-    return effect.value?.truncatedEndpoint ?? effect.value?.endpoint;
+    return moveEffects.getNewChangesForBaseDetach(getDetachedRootId(markEffect), 1).value
+        ?.nodeChange;
 }
-function getTruncatedEndpointForInner(moveEffects, target, revision, id, count) {
-    const effect = getMoveEffect(moveEffects, target, revision, id, count);
-    assert(effect.length === count, 0x934 /* Expected effect to cover entire mark */);
-    return effect.value?.truncatedEndpointForInner;
+function getUpdatedDetachId(manager, mark) {
+    return manager.getNewChangesForBaseDetach(getDetachedRootId(mark), mark.count).value
+        ?.detachId;
 }
 //# sourceMappingURL=compose.js.map