@fluidframework/tree 2.73.0 → 2.74.0-368706

package/lib/feature-libraries/schema-index/schemaSummarizer.js

@@ -5,28 +5,55 @@
 import { bufferToString } from "@fluid-internal/client-utils";
 import { assert } from "@fluidframework/core-utils/internal";
 import { SummaryType } from "@fluidframework/driver-definitions";
-import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal";
 import { schemaDataIsEmpty, } from "../../core/index.js";
+import { VersionedSummarizer, } from "../../shared-tree-core/index.js";
 import { encodeRepo } from "./codec.js";
-const schemaStringKey = "SchemaString";
+export const schemaStringKey = "SchemaString";
+/**
+ * The versions for the schema summary format.
+ */
+export var SchemaSummaryFormatVersion;
+(function (SchemaSummaryFormatVersion) {
+    /**
+     * This version represents summary format before summary versioning was introduced.
+     */
+    SchemaSummaryFormatVersion[SchemaSummaryFormatVersion["v1"] = 1] = "v1";
+    /**
+     * This version adds metadata to the summary. This is backward compatible with version 1.
+     */
+    SchemaSummaryFormatVersion[SchemaSummaryFormatVersion["v2"] = 2] = "v2";
+    /**
+     * The latest version of the summary. Must be updated when a new version is added.
+     */
+    SchemaSummaryFormatVersion[SchemaSummaryFormatVersion["vLatest"] = 2] = "vLatest";
+})(SchemaSummaryFormatVersion || (SchemaSummaryFormatVersion = {}));
+const supportedVersions = new Set([
+    1 /* SchemaSummaryFormatVersion.v1 */,
+    2 /* SchemaSummaryFormatVersion.v2 */,
+]);
+/**
+ * Returns the summary version to use as per the given minimum version for collab.
+ */
+function minVersionToSchemaSummaryFormatVersion(version) {
+    // Currently, version 2 is written which adds metadata blob to the summary.
+    return 2 /* SchemaSummaryFormatVersion.v2 */;
+}
 /**
  * Provides methods for summarizing and loading a schema repository.
  */
-export class SchemaSummarizer {
-    constructor(schema, collabWindow, codec) {
+export class SchemaSummarizer extends VersionedSummarizer {
+    constructor(schema, collabWindow, codec, minVersionForCollab) {
+        super("Schema", minVersionToSchemaSummaryFormatVersion(minVersionForCollab), supportedVersions, true /* supportPreVersioningFormat */);
         this.schema = schema;
         this.codec = codec;
-        this.key = "Schema";
         this.schema.events.on("afterSchemaChange", () => {
             // Invalidate the cache, as we need to regenerate the blob if the schema changes
             // We are assuming that schema changes from remote ops are valid, as we are in a summarization context.
             this.schemaIndexLastChangedSeq = collabWindow.getCurrentSeq();
         });
     }
-    summarize(props) {
-        const incrementalSummaryContext = props.incrementalSummaryContext;
-        const builder = new SummaryTreeBuilder();
-        const fullTree = props.fullTree ?? false;
+    summarizeInternal(props) {
+        const { builder, incrementalSummaryContext, stringify, fullTree = false } = props;
         if (!fullTree &&
             incrementalSummaryContext !== undefined &&
             this.schemaIndexLastChangedSeq !== undefined &&
@@ -34,12 +61,11 @@ export class SchemaSummarizer {
             builder.addHandle(schemaStringKey, SummaryType.Blob, `${incrementalSummaryContext.summaryPath}/${schemaStringKey}`);
         }
         else {
-            const dataString = JSON.stringify(this.codec.encode(this.schema));
+            const dataString = stringify(this.codec.encode(this.schema));
             builder.addBlob(schemaStringKey, dataString);
         }
-        return builder.getSummaryTree();
     }
-    async load(services, parse) {
+    async loadInternal(services, parse) {
         const schemaBuffer = await services.readBlob(schemaStringKey);
         // After the awaits, validate that the schema is in a clean state.
         // This detects any schema that could have been accidentally added through

package/lib/feature-libraries/schema-index/schemaSummarizer.js.map

@@ -1 +1 @@
-{"version":3,"file":"schemaSummarizer.js","sourceRoot":"","sources":["../../../src/feature-libraries/schema-index/schemaSummarizer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAC;AAE7D,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AAMjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAG5E,OAAO,EAIN,iBAAiB,GACjB,MAAM,qBAAqB,CAAC;AAS7B,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,MAAM,eAAe,GAAG,cAAc,CAAC;AACvC;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAK5B,YACkB,MAA+B,EAChD,YAA0B,EACT,KAAmC;QAFnC,WAAM,GAAN,MAAM,CAAyB;QAE/B,UAAK,GAAL,KAAK,CAA8B;QAPrC,QAAG,GAAG,QAAQ,CAAC;QAS9B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;YAC/C,gFAAgF;YAChF,uGAAuG;YACvG,IAAI,CAAC,yBAAyB,GAAG,YAAY,CAAC,aAAa,EAAE,CAAC;QAC/D,CAAC,CAAC,CAAC;IACJ,CAAC;IAEM,SAAS,CAAC,KAMhB;QACA,MAAM,yBAAyB,GAAG,KAAK,CAAC,yBAAyB,CAAC;QAClE,MAAM,OAAO,GAAG,IAAI,kBAAkB,EAAE,CAAC;QACzC,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC;QACzC,IACC,CAAC,QAAQ;YACT,yBAAyB,KAAK,SAAS;YACvC,IAAI,CAAC,yBAAyB,KAAK,SAAS;YAC5C,yBAAyB,CAAC,2BAA2B,IAAI,IAAI,CAAC,yBAAyB,EACtF,CAAC;YACF,OAAO,CAAC,SAAS,CAChB,eAAe,EACf,WAAW,CAAC,IAAI,EAChB,GAAG,yBAAyB,CAAC,WAAW,IAAI,eAAe,EAAE,CAC7D,CAAC;QACH,CAAC;aAAM,CAAC;YACP,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAClE,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,OAAO,CAAC,cAAc,EAAE,CAAC;IACjC,CAAC;IAEM,KAAK,CAAC,IAAI,CAChB,QAAgC,EAChC,KAA2B;QAE3B,MAAM,YAAY,GAAoB,MAAM,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QAC/E,kEAAkE;QAClE,0EAA0E;QAC1E,iDAAiD;QACjD,MAAM,CACL,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,EAC9B,KAAK,CAAC,0EAA0E,CAChF,CAAC;QAEF,MAAM,YAAY,GAAG,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC3D,+DAA+D;QAC/D,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,IAAI,CAAC,yBAAyB,GAAG,CAAC,CAAC;IACpC,CAAC;CACD;AAED;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAC/B,MAAwB,EACxB,YAAiC;IAEjC,OAAO,UAAU,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AACzC,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { bufferToString } from \"@fluid-internal/client-utils\";\nimport { assert } from \"@fluidframework/core-utils/internal\";\nimport type { IChannelStorageService } from \"@fluidframework/datastore-definitions/internal\";\nimport { SummaryType } from \"@fluidframework/driver-definitions\";\nimport type {\n\tIExperimentalIncrementalSummaryContext,\n\tISummaryTreeWithStats,\n\tITelemetryContext,\n} from \"@fluidframework/runtime-definitions/internal\";\nimport { SummaryTreeBuilder } from \"@fluidframework/runtime-utils/internal\";\n\nimport type { IJsonCodec } from \"../../codec/index.js\";\nimport {\n\ttype MutableTreeStoredSchema,\n\ttype SchemaFormatVersion,\n\ttype TreeStoredSchema,\n\tschemaDataIsEmpty,\n} from \"../../core/index.js\";\nimport type {\n\tSummarizable,\n\tSummaryElementParser,\n\tSummaryElementStringifier,\n} from \"../../shared-tree-core/index.js\";\nimport type { JsonCompatible } from \"../../util/index.js\";\nimport type { CollabWindow } from \"../incrementalSummarizationUtils.js\";\n\nimport { encodeRepo } from \"./codec.js\";\n\nconst schemaStringKey = \"SchemaString\";\n/**\n * Provides methods for summarizing and loading a schema repository.\n */\nexport class SchemaSummarizer implements Summarizable {\n\tpublic readonly key = \"Schema\";\n\n\tprivate schemaIndexLastChangedSeq: number | undefined;\n\n\tpublic constructor(\n\t\tprivate readonly schema: MutableTreeStoredSchema,\n\t\tcollabWindow: CollabWindow,\n\t\tprivate readonly codec: IJsonCodec<TreeStoredSchema>,\n\t) {\n\t\tthis.schema.events.on(\"afterSchemaChange\", () => {\n\t\t\t// Invalidate the cache, as we need to regenerate the blob if the schema changes\n\t\t\t// We are assuming that schema changes from remote ops are valid, as we are in a summarization context.\n\t\t\tthis.schemaIndexLastChangedSeq = collabWindow.getCurrentSeq();\n\t\t});\n\t}\n\n\tpublic summarize(props: {\n\t\tstringify: SummaryElementStringifier;\n\t\tfullTree?: boolean;\n\t\ttrackState?: boolean;\n\t\ttelemetryContext?: ITelemetryContext;\n\t\tincrementalSummaryContext?: IExperimentalIncrementalSummaryContext;\n\t}): ISummaryTreeWithStats {\n\t\tconst incrementalSummaryContext = props.incrementalSummaryContext;\n\t\tconst builder = new SummaryTreeBuilder();\n\t\tconst fullTree = props.fullTree ?? false;\n\t\tif (\n\t\t\t!fullTree &&\n\t\t\tincrementalSummaryContext !== undefined &&\n\t\t\tthis.schemaIndexLastChangedSeq !== undefined &&\n\t\t\tincrementalSummaryContext.latestSummarySequenceNumber >= this.schemaIndexLastChangedSeq\n\t\t) {\n\t\t\tbuilder.addHandle(\n\t\t\t\tschemaStringKey,\n\t\t\t\tSummaryType.Blob,\n\t\t\t\t`${incrementalSummaryContext.summaryPath}/${schemaStringKey}`,\n\t\t\t);\n\t\t} else {\n\t\t\tconst dataString = JSON.stringify(this.codec.encode(this.schema));\n\t\t\tbuilder.addBlob(schemaStringKey, dataString);\n\t\t}\n\t\treturn builder.getSummaryTree();\n\t}\n\n\tpublic async load(\n\t\tservices: IChannelStorageService,\n\t\tparse: SummaryElementParser,\n\t): Promise<void> {\n\t\tconst schemaBuffer: ArrayBufferLike = await services.readBlob(schemaStringKey);\n\t\t// After the awaits, validate that the schema is in a clean state.\n\t\t// This detects any schema that could have been accidentally added through\n\t\t// invalid means and are about to be overwritten.\n\t\tassert(\n\t\t\tschemaDataIsEmpty(this.schema),\n\t\t\t0x3da /* there should not already be stored schema when loading stored schema */,\n\t\t);\n\n\t\tconst schemaString = bufferToString(schemaBuffer, \"utf-8\");\n\t\t// Currently no Fluid handles are used, so just use JSON.parse.\n\t\tconst decoded = this.codec.decode(JSON.parse(schemaString));\n\t\tthis.schema.apply(decoded);\n\t\tthis.schemaIndexLastChangedSeq = 0;\n\t}\n}\n\n/**\n * Dumps schema into a deterministic JSON compatible semi-human readable format.\n *\n * @remarks\n * This can be used to help inspect schema for debugging, and to save a snapshot of schema to help detect and review changes to an applications schema.\n */\nexport function encodeTreeSchema(\n\tschema: TreeStoredSchema,\n\twriteVersion: SchemaFormatVersion,\n): JsonCompatible {\n\treturn encodeRepo(schema, writeVersion);\n}\n"]}
+{"version":3,"file":"schemaSummarizer.js","sourceRoot":"","sources":["../../../src/feature-libraries/schema-index/schemaSummarizer.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 { bufferToString } from \"@fluid-internal/client-utils\";\nimport { assert } from \"@fluidframework/core-utils/internal\";\nimport type { IChannelStorageService } from \"@fluidframework/datastore-definitions/internal\";\nimport { SummaryType } from \"@fluidframework/driver-definitions\";\nimport type {\n\tIExperimentalIncrementalSummaryContext,\n\tITelemetryContext,\n\tMinimumVersionForCollab,\n} from \"@fluidframework/runtime-definitions/internal\";\nimport type { SummaryTreeBuilder } from \"@fluidframework/runtime-utils/internal\";\n\nimport type { IJsonCodec } from \"../../codec/index.js\";\nimport {\n\ttype MutableTreeStoredSchema,\n\ttype SchemaFormatVersion,\n\ttype TreeStoredSchema,\n\tschemaDataIsEmpty,\n} from \"../../core/index.js\";\nimport {\n\tVersionedSummarizer,\n\ttype Summarizable,\n\ttype SummaryElementParser,\n\ttype SummaryElementStringifier,\n} from \"../../shared-tree-core/index.js\";\nimport type { JsonCompatible } from \"../../util/index.js\";\nimport type { CollabWindow } from \"../incrementalSummarizationUtils.js\";\n\nimport { encodeRepo } from \"./codec.js\";\n\nexport const schemaStringKey = \"SchemaString\";\n\n/**\n * The versions for the schema summary format.\n */\nexport const enum SchemaSummaryFormatVersion {\n\t/**\n\t * This version represents summary format before summary versioning was introduced.\n\t */\n\tv1 = 1,\n\t/**\n\t * This version adds metadata to the summary. This is backward compatible with version 1.\n\t */\n\tv2 = 2,\n\t/**\n\t * The latest version of the summary. Must be updated when a new version is added.\n\t */\n\tvLatest = v2,\n}\n\nconst supportedVersions = new Set<SchemaSummaryFormatVersion>([\n\tSchemaSummaryFormatVersion.v1,\n\tSchemaSummaryFormatVersion.v2,\n]);\n\n/**\n * Returns the summary version to use as per the given minimum version for collab.\n */\nfunction minVersionToSchemaSummaryFormatVersion(\n\tversion: MinimumVersionForCollab,\n): SchemaSummaryFormatVersion {\n\t// Currently, version 2 is written which adds metadata blob to the summary.\n\treturn SchemaSummaryFormatVersion.v2;\n}\n\n/**\n * Provides methods for summarizing and loading a schema repository.\n */\nexport class SchemaSummarizer\n\textends VersionedSummarizer<SchemaSummaryFormatVersion>\n\timplements Summarizable\n{\n\tprivate schemaIndexLastChangedSeq: number | undefined;\n\n\tpublic constructor(\n\t\tprivate readonly schema: MutableTreeStoredSchema,\n\t\tcollabWindow: CollabWindow,\n\t\tprivate readonly codec: IJsonCodec<TreeStoredSchema>,\n\t\tminVersionForCollab: MinimumVersionForCollab,\n\t) {\n\t\tsuper(\n\t\t\t\"Schema\",\n\t\t\tminVersionToSchemaSummaryFormatVersion(minVersionForCollab),\n\t\t\tsupportedVersions,\n\t\t\ttrue /* supportPreVersioningFormat */,\n\t\t);\n\t\tthis.schema.events.on(\"afterSchemaChange\", () => {\n\t\t\t// Invalidate the cache, as we need to regenerate the blob if the schema changes\n\t\t\t// We are assuming that schema changes from remote ops are valid, as we are in a summarization context.\n\t\t\tthis.schemaIndexLastChangedSeq = collabWindow.getCurrentSeq();\n\t\t});\n\t}\n\n\tprotected summarizeInternal(props: {\n\t\tstringify: SummaryElementStringifier;\n\t\tfullTree?: boolean;\n\t\ttrackState?: boolean;\n\t\ttelemetryContext?: ITelemetryContext;\n\t\tincrementalSummaryContext?: IExperimentalIncrementalSummaryContext;\n\t\tbuilder: SummaryTreeBuilder;\n\t}): void {\n\t\tconst { builder, incrementalSummaryContext, stringify, fullTree = false } = props;\n\t\tif (\n\t\t\t!fullTree &&\n\t\t\tincrementalSummaryContext !== undefined &&\n\t\t\tthis.schemaIndexLastChangedSeq !== undefined &&\n\t\t\tincrementalSummaryContext.latestSummarySequenceNumber >= this.schemaIndexLastChangedSeq\n\t\t) {\n\t\t\tbuilder.addHandle(\n\t\t\t\tschemaStringKey,\n\t\t\t\tSummaryType.Blob,\n\t\t\t\t`${incrementalSummaryContext.summaryPath}/${schemaStringKey}`,\n\t\t\t);\n\t\t} else {\n\t\t\tconst dataString = stringify(this.codec.encode(this.schema));\n\t\t\tbuilder.addBlob(schemaStringKey, dataString);\n\t\t}\n\t}\n\n\tprotected async loadInternal(\n\t\tservices: IChannelStorageService,\n\t\tparse: SummaryElementParser,\n\t): Promise<void> {\n\t\tconst schemaBuffer: ArrayBufferLike = await services.readBlob(schemaStringKey);\n\t\t// After the awaits, validate that the schema is in a clean state.\n\t\t// This detects any schema that could have been accidentally added through\n\t\t// invalid means and are about to be overwritten.\n\t\tassert(\n\t\t\tschemaDataIsEmpty(this.schema),\n\t\t\t0x3da /* there should not already be stored schema when loading stored schema */,\n\t\t);\n\n\t\tconst schemaString = bufferToString(schemaBuffer, \"utf-8\");\n\t\t// Currently no Fluid handles are used, so just use JSON.parse.\n\t\tconst decoded = this.codec.decode(JSON.parse(schemaString));\n\t\tthis.schema.apply(decoded);\n\t\tthis.schemaIndexLastChangedSeq = 0;\n\t}\n}\n\n/**\n * Dumps schema into a deterministic JSON compatible semi-human readable format.\n *\n * @remarks\n * This can be used to help inspect schema for debugging, and to save a snapshot of schema to help detect and review changes to an applications schema.\n */\nexport function encodeTreeSchema(\n\tschema: TreeStoredSchema,\n\twriteVersion: SchemaFormatVersion,\n): JsonCompatible {\n\treturn encodeRepo(schema, writeVersion);\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;AAoND,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;IAqD1B,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 };
+        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),
             }
-            // `newMark`'s attach portion cancels with `baseMark`'s detach portion.
-            const detachRevision = finalDetach.revision;
-            if (detachRevision !== undefined) {
-                finalDetach.revision = detachRevision;
-            }
-            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 };
@@ -238,13 +154,12 @@ function createNoopMark(length, nodeChange, cellId) {
 }
 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);
+        if (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();
@@ -319,9 +232,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 +265,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