@fluidframework/tree 2.81.0-374083 → 2.81.1

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

@@ -3,48 +3,133 @@
  * Licensed under the MIT License.
  */
 import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
+import { areEqualChangeAtomIds, } from "../../core/index.js";
 import { getLast, hasSome } from "../../util/index.js";
 import { nodeIdFromChangeAtom } from "../deltaUtils.js";
+import { isMoveIn, isMoveOut } from "./moveEffectTable.js";
 import { NoopMarkType } from "./types.js";
-import { areInputCellsEmpty, areOutputCellsEmpty, getAttachedRootId, getDetachedRootId, getInputCellId, } from "./utils.js";
+import { areInputCellsEmpty, areOutputCellsEmpty, getDetachedNodeId, getEndpoint, getInputCellId, isAttachAndDetachEffect, } from "./utils.js";
 export function sequenceFieldToDelta(change, deltaFromChild) {
-    const deltaMarks = [];
+    const local = [];
+    const global = [];
+    const rename = [];
     for (const mark of change) {
         const deltaMark = { count: mark.count };
         const inputCellId = getInputCellId(mark);
         const changes = mark.changes;
-        if (changes !== undefined && inputCellId === undefined) {
+        if (changes !== undefined) {
             const nestedDelta = deltaFromChild(changes);
             if (nestedDelta.size > 0) {
-                deltaMark.fields = nestedDelta;
+                if (inputCellId === undefined) {
+                    deltaMark.fields = nestedDelta;
+                }
+                else {
+                    global.push({
+                        id: nodeIdFromChangeAtom(inputCellId),
+                        fields: nestedDelta,
+                    });
+                }
             }
         }
         if (!areInputCellsEmpty(mark) && !areOutputCellsEmpty(mark)) {
             // Since each cell is associated with exactly one node,
             // the cell starting end ending populated means the cell content has not changed.
-            deltaMarks.push(deltaMark);
+            local.push(deltaMark);
+        }
+        else if (isAttachAndDetachEffect(mark)) {
+            assert(inputCellId !== undefined, 0x81e /* AttachAndDetach mark should have defined input cell ID */);
+            // The cell starting and ending empty means the cell content has not changed,
+            // unless transient content was inserted/attached.
+            if (isMoveIn(mark.attach) && isMoveOut(mark.detach)) {
+                assert(mark.changes === undefined, 0x81f /* AttachAndDetach moves should not have changes */);
+                continue;
+            }
+            const outputId = getDetachedNodeId(mark.detach);
+            assert(outputId !== undefined, 0x820 /* AttachAndDetach mark should have defined output cell ID */);
+            const oldId = nodeIdFromChangeAtom(isMoveIn(mark.attach) ? getEndpoint(mark.attach) : inputCellId);
+            if (!areEqualChangeAtomIds(inputCellId, outputId)) {
+                rename.push({
+                    count: mark.count,
+                    oldId,
+                    newId: nodeIdFromChangeAtom(outputId),
+                });
+            }
+            if (deltaMark.fields) {
+                global.push({
+                    id: oldId,
+                    fields: deltaMark.fields,
+                });
+            }
         }
         else {
             const type = mark.type;
             // Inline into `switch(mark.type)` once we upgrade to TS 4.7
             switch (type) {
+                case "MoveIn": {
+                    local.push({
+                        attach: nodeIdFromChangeAtom(getEndpoint(mark)),
+                        count: mark.count,
+                    });
+                    break;
+                }
                 case "Remove": {
-                    const newDetachId = getDetachedRootId(mark);
+                    const newDetachId = getDetachedNodeId(mark);
                     if (inputCellId === undefined) {
                         deltaMark.detach = nodeIdFromChangeAtom(newDetachId);
-                        deltaMarks.push(deltaMark);
+                        local.push(deltaMark);
+                    }
+                    else {
+                        const oldId = nodeIdFromChangeAtom(inputCellId);
+                        // Removal of already removed content is only a no-op if the detach IDs are different.
+                        if (!areEqualChangeAtomIds(inputCellId, newDetachId)) {
+                            rename.push({
+                                count: mark.count,
+                                oldId,
+                                newId: nodeIdFromChangeAtom(newDetachId),
+                            });
+                        }
+                        // In all cases, the nested changes apply
+                        if (deltaMark.fields) {
+                            global.push({
+                                id: oldId,
+                                fields: deltaMark.fields,
+                            });
+                        }
+                    }
+                    break;
+                }
+                case "MoveOut": {
+                    // The move destination will look for the detach ID of the source, so we can ignore `finalEndpoint`.
+                    const detachId = nodeIdFromChangeAtom(getDetachedNodeId(mark));
+                    if (inputCellId === undefined) {
+                        deltaMark.detach = detachId;
+                        local.push(deltaMark);
+                    }
+                    else {
+                        // Move sources implicitly restore their content
+                        rename.push({
+                            count: mark.count,
+                            oldId: nodeIdFromChangeAtom(inputCellId),
+                            newId: detachId,
+                        });
                     }
                     break;
                 }
                 case "Insert": {
-                    const buildId = nodeIdFromChangeAtom(getAttachedRootId(mark));
+                    assert(inputCellId !== undefined, 0x821 /* Active Insert marks must have a CellId */);
+                    const buildId = nodeIdFromChangeAtom(inputCellId);
                     deltaMark.attach = buildId;
-                    deltaMarks.push(deltaMark);
+                    if (deltaMark.fields) {
+                        // Nested changes are represented on the node in its starting location
+                        global.push({ id: buildId, fields: deltaMark.fields });
+                        delete deltaMark.fields;
+                    }
+                    local.push(deltaMark);
                     break;
                 }
                 case NoopMarkType: {
                     if (inputCellId === undefined) {
-                        deltaMarks.push(deltaMark);
+                        local.push(deltaMark);
                     }
                     break;
                 }
@@ -59,15 +144,25 @@ export function sequenceFieldToDelta(change, deltaFromChild) {
         }
     }
     // Remove trailing no-op marks
-    while (hasSome(deltaMarks)) {
-        const lastMark = getLast(deltaMarks);
+    while (hasSome(local)) {
+        const lastMark = getLast(local);
         if (lastMark.attach !== undefined ||
             lastMark.detach !== undefined ||
             lastMark.fields !== undefined) {
             break;
         }
-        deltaMarks.pop();
+        local.pop();
+    }
+    const delta = {};
+    if (local.length > 0) {
+        delta.local = local;
+    }
+    if (global.length > 0) {
+        delta.global = global;
+    }
+    if (rename.length > 0) {
+        delta.rename = rename;
     }
-    return deltaMarks;
+    return delta;
 }
 //# sourceMappingURL=sequenceFieldToDelta.js.map

package/lib/feature-libraries/sequence-field/sequenceFieldToDelta.js.map

@@ -1 +1 @@
-{"version":3,"file":"sequenceFieldToDelta.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/sequenceFieldToDelta.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 { assert, unreachableCase } from \"@fluidframework/core-utils/internal\";\n\nimport type { DeltaFieldChanges, DeltaMark } from \"../../core/index.js\";\nimport { getLast, hasSome, type Mutable } from \"../../util/index.js\";\nimport { nodeIdFromChangeAtom } from \"../deltaUtils.js\";\nimport type { ToDelta } from \"../modular-schema/index.js\";\n\nimport { type MarkList, NoopMarkType } from \"./types.js\";\nimport {\n\tareInputCellsEmpty,\n\tareOutputCellsEmpty,\n\tgetAttachedRootId,\n\tgetDetachedRootId,\n\tgetInputCellId,\n} from \"./utils.js\";\n\nexport function sequenceFieldToDelta(\n\tchange: MarkList,\n\tdeltaFromChild: ToDelta,\n): DeltaFieldChanges {\n\tconst deltaMarks: DeltaMark[] = [];\n\n\tfor (const mark of change) {\n\t\tconst deltaMark: Mutable<DeltaMark> = { count: mark.count };\n\t\tconst inputCellId = getInputCellId(mark);\n\t\tconst changes = mark.changes;\n\t\tif (changes !== undefined && inputCellId === undefined) {\n\t\t\tconst nestedDelta = deltaFromChild(changes);\n\t\t\tif (nestedDelta.size > 0) {\n\t\t\t\tdeltaMark.fields = nestedDelta;\n\t\t\t}\n\t\t}\n\t\tif (!areInputCellsEmpty(mark) && !areOutputCellsEmpty(mark)) {\n\t\t\t// Since each cell is associated with exactly one node,\n\t\t\t// the cell starting end ending populated means the cell content has not changed.\n\t\t\tdeltaMarks.push(deltaMark);\n\t\t} else {\n\t\t\tconst type = mark.type;\n\t\t\t// Inline into `switch(mark.type)` once we upgrade to TS 4.7\n\t\t\tswitch (type) {\n\t\t\t\tcase \"Remove\": {\n\t\t\t\t\tconst newDetachId = getDetachedRootId(mark);\n\t\t\t\t\tif (inputCellId === undefined) {\n\t\t\t\t\t\tdeltaMark.detach = nodeIdFromChangeAtom(newDetachId);\n\t\t\t\t\t\tdeltaMarks.push(deltaMark);\n\t\t\t\t\t}\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tcase \"Insert\": {\n\t\t\t\t\tconst buildId = nodeIdFromChangeAtom(getAttachedRootId(mark));\n\t\t\t\t\tdeltaMark.attach = buildId;\n\t\t\t\t\tdeltaMarks.push(deltaMark);\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tcase NoopMarkType: {\n\t\t\t\t\tif (inputCellId === undefined) {\n\t\t\t\t\t\tdeltaMarks.push(deltaMark);\n\t\t\t\t\t}\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tcase \"Rename\": {\n\t\t\t\t\tassert(\n\t\t\t\t\t\tmark.cellId !== undefined,\n\t\t\t\t\t\t0x9f9 /* Renames should only target empty cells */,\n\t\t\t\t\t);\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tdefault: {\n\t\t\t\t\tunreachableCase(type);\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\t// Remove trailing no-op marks\n\twhile (hasSome(deltaMarks)) {\n\t\tconst lastMark = getLast(deltaMarks);\n\t\tif (\n\t\t\tlastMark.attach !== undefined ||\n\t\t\tlastMark.detach !== undefined ||\n\t\t\tlastMark.fields !== undefined\n\t\t) {\n\t\t\tbreak;\n\t\t}\n\t\tdeltaMarks.pop();\n\t}\n\n\treturn deltaMarks;\n}\n"]}
+{"version":3,"file":"sequenceFieldToDelta.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/sequenceFieldToDelta.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 { assert, unreachableCase } from \"@fluidframework/core-utils/internal\";\n\nimport {\n\ttype DeltaDetachedNodeChanges,\n\ttype DeltaDetachedNodeRename,\n\ttype DeltaMark,\n\tareEqualChangeAtomIds,\n} from \"../../core/index.js\";\nimport { getLast, hasSome, type Mutable } from \"../../util/index.js\";\nimport { nodeIdFromChangeAtom } from \"../deltaUtils.js\";\nimport type { FieldChangeDelta, ToDelta } from \"../modular-schema/index.js\";\n\nimport { isMoveIn, isMoveOut } from \"./moveEffectTable.js\";\nimport { type MarkList, NoopMarkType } from \"./types.js\";\nimport {\n\tareInputCellsEmpty,\n\tareOutputCellsEmpty,\n\tgetDetachedNodeId,\n\tgetEndpoint,\n\tgetInputCellId,\n\tisAttachAndDetachEffect,\n} from \"./utils.js\";\n\nexport function sequenceFieldToDelta(\n\tchange: MarkList,\n\tdeltaFromChild: ToDelta,\n): FieldChangeDelta {\n\tconst local: DeltaMark[] = [];\n\tconst global: DeltaDetachedNodeChanges[] = [];\n\tconst rename: DeltaDetachedNodeRename[] = [];\n\n\tfor (const mark of change) {\n\t\tconst deltaMark: Mutable<DeltaMark> = { count: mark.count };\n\t\tconst inputCellId = getInputCellId(mark);\n\t\tconst changes = mark.changes;\n\t\tif (changes !== undefined) {\n\t\t\tconst nestedDelta = deltaFromChild(changes);\n\t\t\tif (nestedDelta.size > 0) {\n\t\t\t\tif (inputCellId === undefined) {\n\t\t\t\t\tdeltaMark.fields = nestedDelta;\n\t\t\t\t} else {\n\t\t\t\t\tglobal.push({\n\t\t\t\t\t\tid: nodeIdFromChangeAtom(inputCellId),\n\t\t\t\t\t\tfields: nestedDelta,\n\t\t\t\t\t});\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\tif (!areInputCellsEmpty(mark) && !areOutputCellsEmpty(mark)) {\n\t\t\t// Since each cell is associated with exactly one node,\n\t\t\t// the cell starting end ending populated means the cell content has not changed.\n\t\t\tlocal.push(deltaMark);\n\t\t} else if (isAttachAndDetachEffect(mark)) {\n\t\t\tassert(\n\t\t\t\tinputCellId !== undefined,\n\t\t\t\t0x81e /* AttachAndDetach mark should have defined input cell ID */,\n\t\t\t);\n\t\t\t// The cell starting and ending empty means the cell content has not changed,\n\t\t\t// unless transient content was inserted/attached.\n\t\t\tif (isMoveIn(mark.attach) && isMoveOut(mark.detach)) {\n\t\t\t\tassert(\n\t\t\t\t\tmark.changes === undefined,\n\t\t\t\t\t0x81f /* AttachAndDetach moves should not have changes */,\n\t\t\t\t);\n\t\t\t\tcontinue;\n\t\t\t}\n\n\t\t\tconst outputId = getDetachedNodeId(mark.detach);\n\t\t\tassert(\n\t\t\t\toutputId !== undefined,\n\t\t\t\t0x820 /* AttachAndDetach mark should have defined output cell ID */,\n\t\t\t);\n\t\t\tconst oldId = nodeIdFromChangeAtom(\n\t\t\t\tisMoveIn(mark.attach) ? getEndpoint(mark.attach) : inputCellId,\n\t\t\t);\n\t\t\tif (!areEqualChangeAtomIds(inputCellId, outputId)) {\n\t\t\t\trename.push({\n\t\t\t\t\tcount: mark.count,\n\t\t\t\t\toldId,\n\t\t\t\t\tnewId: nodeIdFromChangeAtom(outputId),\n\t\t\t\t});\n\t\t\t}\n\t\t\tif (deltaMark.fields) {\n\t\t\t\tglobal.push({\n\t\t\t\t\tid: oldId,\n\t\t\t\t\tfields: deltaMark.fields,\n\t\t\t\t});\n\t\t\t}\n\t\t} else {\n\t\t\tconst type = mark.type;\n\t\t\t// Inline into `switch(mark.type)` once we upgrade to TS 4.7\n\t\t\tswitch (type) {\n\t\t\t\tcase \"MoveIn\": {\n\t\t\t\t\tlocal.push({\n\t\t\t\t\t\tattach: nodeIdFromChangeAtom(getEndpoint(mark)),\n\t\t\t\t\t\tcount: mark.count,\n\t\t\t\t\t});\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tcase \"Remove\": {\n\t\t\t\t\tconst newDetachId = getDetachedNodeId(mark);\n\t\t\t\t\tif (inputCellId === undefined) {\n\t\t\t\t\t\tdeltaMark.detach = nodeIdFromChangeAtom(newDetachId);\n\t\t\t\t\t\tlocal.push(deltaMark);\n\t\t\t\t\t} else {\n\t\t\t\t\t\tconst oldId = nodeIdFromChangeAtom(inputCellId);\n\t\t\t\t\t\t// Removal of already removed content is only a no-op if the detach IDs are different.\n\t\t\t\t\t\tif (!areEqualChangeAtomIds(inputCellId, newDetachId)) {\n\t\t\t\t\t\t\trename.push({\n\t\t\t\t\t\t\t\tcount: mark.count,\n\t\t\t\t\t\t\t\toldId,\n\t\t\t\t\t\t\t\tnewId: nodeIdFromChangeAtom(newDetachId),\n\t\t\t\t\t\t\t});\n\t\t\t\t\t\t}\n\t\t\t\t\t\t// In all cases, the nested changes apply\n\t\t\t\t\t\tif (deltaMark.fields) {\n\t\t\t\t\t\t\tglobal.push({\n\t\t\t\t\t\t\t\tid: oldId,\n\t\t\t\t\t\t\t\tfields: deltaMark.fields,\n\t\t\t\t\t\t\t});\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tcase \"MoveOut\": {\n\t\t\t\t\t// The move destination will look for the detach ID of the source, so we can ignore `finalEndpoint`.\n\t\t\t\t\tconst detachId = nodeIdFromChangeAtom(getDetachedNodeId(mark));\n\t\t\t\t\tif (inputCellId === undefined) {\n\t\t\t\t\t\tdeltaMark.detach = detachId;\n\t\t\t\t\t\tlocal.push(deltaMark);\n\t\t\t\t\t} else {\n\t\t\t\t\t\t// Move sources implicitly restore their content\n\t\t\t\t\t\trename.push({\n\t\t\t\t\t\t\tcount: mark.count,\n\t\t\t\t\t\t\toldId: nodeIdFromChangeAtom(inputCellId),\n\t\t\t\t\t\t\tnewId: detachId,\n\t\t\t\t\t\t});\n\t\t\t\t\t}\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tcase \"Insert\": {\n\t\t\t\t\tassert(\n\t\t\t\t\t\tinputCellId !== undefined,\n\t\t\t\t\t\t0x821 /* Active Insert marks must have a CellId */,\n\t\t\t\t\t);\n\t\t\t\t\tconst buildId = nodeIdFromChangeAtom(inputCellId);\n\t\t\t\t\tdeltaMark.attach = buildId;\n\t\t\t\t\tif (deltaMark.fields) {\n\t\t\t\t\t\t// Nested changes are represented on the node in its starting location\n\t\t\t\t\t\tglobal.push({ id: buildId, fields: deltaMark.fields });\n\t\t\t\t\t\tdelete deltaMark.fields;\n\t\t\t\t\t}\n\t\t\t\t\tlocal.push(deltaMark);\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tcase NoopMarkType: {\n\t\t\t\t\tif (inputCellId === undefined) {\n\t\t\t\t\t\tlocal.push(deltaMark);\n\t\t\t\t\t}\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tcase \"Rename\": {\n\t\t\t\t\tassert(\n\t\t\t\t\t\tmark.cellId !== undefined,\n\t\t\t\t\t\t0x9f9 /* Renames should only target empty cells */,\n\t\t\t\t\t);\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tdefault: {\n\t\t\t\t\tunreachableCase(type);\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\t// Remove trailing no-op marks\n\twhile (hasSome(local)) {\n\t\tconst lastMark = getLast(local);\n\t\tif (\n\t\t\tlastMark.attach !== undefined ||\n\t\t\tlastMark.detach !== undefined ||\n\t\t\tlastMark.fields !== undefined\n\t\t) {\n\t\t\tbreak;\n\t\t}\n\t\tlocal.pop();\n\t}\n\tconst delta: Mutable<FieldChangeDelta> = {};\n\tif (local.length > 0) {\n\t\tdelta.local = local;\n\t}\n\tif (global.length > 0) {\n\t\tdelta.global = global;\n\t}\n\tif (rename.length > 0) {\n\t\tdelta.rename = rename;\n\t}\n\treturn delta;\n}\n"]}

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

@@ -0,0 +1,16 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+import { Multiplicity } from "../../core/index.js";
+import { sequenceIdentifier } from "../fieldKindIdentifiers.js";
+import { FlexFieldKind } from "../modular-schema/index.js";
+import type { SequenceFieldEditor } from "./sequenceFieldEditor.js";
+interface Sequence extends FlexFieldKind<SequenceFieldEditor, typeof sequenceIdentifier, Multiplicity.Sequence> {
+}
+/**
+ * 0 or more items.
+ */
+export declare const sequence: Sequence;
+export {};
+//# sourceMappingURL=sequenceKind.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"sequenceKind.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/sequenceKind.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAgC,MAAM,qBAAqB,CAAC;AACjF,OAAO,EACN,kBAAkB,EAIlB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,UAAU,QACT,SAAQ,aAAa,CACpB,mBAAmB,EACnB,OAAO,kBAAkB,EACzB,YAAY,CAAC,QAAQ,CACrB;CAAG;AAEL;;GAEG;AACH,eAAO,MAAM,QAAQ,EAAE,QAYtB,CAAC"}

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

@@ -0,0 +1,21 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+import { Multiplicity, forbiddenFieldKindIdentifier } from "../../core/index.js";
+import { sequenceIdentifier, identifierFieldIdentifier, requiredIdentifier, optionalIdentifier, } from "../fieldKindIdentifiers.js";
+import { FlexFieldKind } from "../modular-schema/index.js";
+import { sequenceFieldChangeHandler } from "./sequenceFieldChangeHandler.js";
+/**
+ * 0 or more items.
+ */
+export const sequence = new FlexFieldKind(sequenceIdentifier, Multiplicity.Sequence, {
+    changeHandler: sequenceFieldChangeHandler,
+    allowMonotonicUpgradeFrom: new Set([
+        requiredIdentifier,
+        optionalIdentifier,
+        identifierFieldIdentifier,
+        forbiddenFieldKindIdentifier,
+    ]),
+});
+//# sourceMappingURL=sequenceKind.js.map

package/lib/feature-libraries/sequence-field/sequenceKind.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sequenceKind.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/sequenceKind.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AACjF,OAAO,EACN,kBAAkB,EAClB,yBAAyB,EACzB,kBAAkB,EAClB,kBAAkB,GAClB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAU7E;;GAEG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAa,IAAI,aAAa,CAClD,kBAAkB,EAClB,YAAY,CAAC,QAAQ,EACrB;IACC,aAAa,EAAE,0BAA0B;IACzC,yBAAyB,EAAE,IAAI,GAAG,CAAC;QAClC,kBAAkB;QAClB,kBAAkB;QAClB,yBAAyB;QACzB,4BAA4B;KAC5B,CAAC;CACF,CACD,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { Multiplicity, forbiddenFieldKindIdentifier } from \"../../core/index.js\";\nimport {\n\tsequenceIdentifier,\n\tidentifierFieldIdentifier,\n\trequiredIdentifier,\n\toptionalIdentifier,\n} from \"../fieldKindIdentifiers.js\";\nimport { FlexFieldKind } from \"../modular-schema/index.js\";\n\nimport { sequenceFieldChangeHandler } from \"./sequenceFieldChangeHandler.js\";\nimport type { SequenceFieldEditor } from \"./sequenceFieldEditor.js\";\n\ninterface Sequence\n\textends FlexFieldKind<\n\t\tSequenceFieldEditor,\n\t\ttypeof sequenceIdentifier,\n\t\tMultiplicity.Sequence\n\t> {}\n\n/**\n * 0 or more items.\n */\nexport const sequence: Sequence = new FlexFieldKind(\n\tsequenceIdentifier,\n\tMultiplicity.Sequence,\n\t{\n\t\tchangeHandler: sequenceFieldChangeHandler,\n\t\tallowMonotonicUpgradeFrom: new Set([\n\t\t\trequiredIdentifier,\n\t\t\toptionalIdentifier,\n\t\t\tidentifierFieldIdentifier,\n\t\t\tforbiddenFieldKindIdentifier,\n\t\t]),\n\t},\n);\n"]}

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

@@ -45,6 +45,7 @@ export interface NoopMark {
 export interface HasRevisionTag {
     /**
      * The revision this mark is part of.
+     * Only set for marks in fields which are a composition of multiple revisions.
      */
     revision?: RevisionTag;
 }
@@ -60,12 +61,8 @@ export interface HasRevisionTag {
  * Carries a `MoveId` in case it is rebased over the content being moved out, in which case this mark
  * will transform into a pair of returns which will move the content back into this cell.
  */
-export interface Attach extends HasMoveId, HasRevisionTag {
+export interface Insert extends HasMoveId, HasRevisionTag {
     type: "Insert";
-    /**
-     * This field should only be used if the attach is a pin.
-     */
-    detachCellId?: ChangeAtomId;
 }
 export interface HasMoveFields extends HasMoveId, HasRevisionTag {
     /**
@@ -75,35 +72,70 @@ export interface HasMoveFields extends HasMoveId, HasRevisionTag {
     finalEndpoint?: ChangeAtomId;
 }
 /**
- * Removes nodes from their cells.
- * Always brings about the desired outcome: the targeted nodes are removed from their cells.
- * Note that this may not require any changes if targeted nodes are already removed when this mark is applied.
+ * Fills empty cells with content that is moved out from another cell.
+ * Always brings about the desired outcome: the nodes being moved are in the target cells.
+ * Note that this may not require any changes if these nodes are already in the target cells when this mark is applied.
  *
- * Rebasing this mark never causes it to target different set of nodes.
- * Rebasing this mark can cause it to clear a different set of cells.
+ * Rebasing this mark never causes it to move-in a different set of nodes.
+ * Rebasing this mark never causes it to fill a different set of cells
+ * (though the way those cells are identified may change).
+ *
+ * Only ever targets empty cells. It transforms into a idempotent Insert if the target cells are not empty.
  */
-export interface Detach extends HasRevisionTag {
-    readonly type: "Remove";
-    readonly id: ChangesetLocalId;
-    /**
-     * The ID the cell should be set to when this detach is applied.
-     * If not set, this the same as the detach ID.
-     * This applies to the cell where the node is being detached from,
-     * or the last cell the node occupied if it is already detached.
-     *
-     * This field is used to represent the composition of a pin and a detach.
-     * The composition will be the second detach but with the pin's detachId as detachCellId.
-     */
-    detachCellId?: ChangeAtomId;
+export interface MoveIn extends HasMoveFields {
+    type: "MoveIn";
+}
+export interface DetachFields {
     /**
-     * When set, this represents a rename of this cell to be applied after the detach.
-     * Note that this does not affect the ID associated with the detached node.
+     * When set, the detach should use the `CellId` specified in this object to characterize the cell being emptied.
      *
      * This is used in two situations:
      * - to restore the prior ID of a cell in a rollback changeset
      * - to represent the impact of a detach composed with a rename
      */
-    readonly cellRename?: CellId;
+    readonly idOverride?: CellId;
+}
+/**
+ * Removes nodes from their cells.
+ * Always brings about the desired outcome: the targeted nodes are removed from their cells.
+ * Note that this may not require any changes if targeted nodes are already removed when this mark is applied.
+ *
+ * Rebasing this mark never causes it to target different set of nodes.
+ * Rebasing this mark can cause it to clear a different set of cells.
+ */
+export interface Remove extends HasRevisionTag, DetachFields {
+    type: "Remove";
+    id: ChangesetLocalId;
+}
+/**
+ * Removes nodes from their cells so they can be moved into other cells.
+ * Always brings about the desired outcome: the targeted nodes are removed from their cells.
+ * Note that this may not require any changes if targeted nodes are already removed when this mark is applied.
+ *
+ * Rebasing this mark never causes it to target different set of nodes.
+ * Rebasing this mark can cause it to clear a different set of cells.
+ */
+export interface MoveOut extends HasMoveFields, DetachFields {
+    type: "MoveOut";
+}
+export type Attach = Insert | MoveIn;
+export type Detach = Remove | MoveOut;
+/**
+ * Fills then empties cells.
+ *
+ * Only ever targets empty cells.
+ *
+ * As a matter of normalization, we only use an AttachAndDetach to represent MoveIn ○ Remove.
+ *
+ * We do NOT use AttachAndDetach to represent the following compositions:
+ * - Insert/Revive ○ Remove (represented by a Remove)
+ * - Insert/Revive ○ MoveOut (represented by a MoveOut)
+ * - MoveIn ○ MoveOut (represented by a Rename)
+ */
+export interface AttachAndDetach {
+    type: "AttachAndDetach";
+    attach: Attach;
+    detach: Detach;
 }
 /**
  * Represents the renaming of an empty cell.
@@ -117,10 +149,7 @@ export interface Rename {
     type: "Rename";
     readonly idOverride: CellId;
 }
-export interface Pin extends CellMark<Attach> {
-    cellId: undefined;
-}
-export type MarkEffect = NoopMark | Attach | Detach | Rename;
+export type MarkEffect = NoopMark | Attach | Detach | AttachAndDetach | Rename;
 export type CellMark<TMark> = TMark & HasMarkFields;
 export type Mark = CellMark<MarkEffect>;
 export type MarkList = Mark[];

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAEzD,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC;AAE/B;;;;;;GAMG;AACH,MAAM,MAAM,MAAM,GAAG,gBAAgB,CAAC;AAEtC,MAAM,WAAW,SAAS;IACzB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;CACX;AAED,MAAM,WAAW,MAAO,SAAQ,YAAY;CAAG;AAE/C;;GAEG;AACH,MAAM,WAAW,aAAa;IAC7B;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,KAAK,EAAE,SAAS,CAAC;CACjB;AAED,eAAO,MAAM,YAAY,WAAY,CAAC;AACtC,MAAM,WAAW,QAAQ;IACxB;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,YAAY,CAAC;CAC3B;AAED,MAAM,WAAW,cAAc;IAC9B;;OAEG;IACH,QAAQ,CAAC,EAAE,WAAW,CAAC;CACvB;AAED;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,MAAO,SAAQ,SAAS,EAAE,cAAc;IACxD,IAAI,EAAE,QAAQ,CAAC;IAGf;;OAEG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;CAC5B;AAED,MAAM,WAAW,aAAc,SAAQ,SAAS,EAAE,cAAc;IAC/D;;;OAGG;IACH,aAAa,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,MAAO,SAAQ,cAAc;IAC7C,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,EAAE,EAAE,gBAAgB,CAAC;IAE9B;;;;;;;;OAQG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;IAE5B;;;;;;;OAOG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,MAAM;IACtB,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,GAAI,SAAQ,QAAQ,CAAC,MAAM,CAAC;IAC5C,MAAM,EAAE,SAAS,CAAC;CAClB;AAED,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AAE7D,MAAM,MAAM,QAAQ,CAAC,KAAK,IAAI,KAAK,GAAG,aAAa,CAAC;AAEpD,MAAM,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;AAExC,MAAM,MAAM,QAAQ,GAAG,IAAI,EAAE,CAAC;AAE9B,MAAM,MAAM,SAAS,GAAG,QAAQ,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAEzD,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC;AAE/B;;;;;;GAMG;AACH,MAAM,MAAM,MAAM,GAAG,gBAAgB,CAAC;AAEtC,MAAM,WAAW,SAAS;IACzB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;CACX;AAED,MAAM,WAAW,MAAO,SAAQ,YAAY;CAAG;AAE/C;;GAEG;AACH,MAAM,WAAW,aAAa;IAC7B;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,KAAK,EAAE,SAAS,CAAC;CACjB;AAED,eAAO,MAAM,YAAY,WAAY,CAAC;AACtC,MAAM,WAAW,QAAQ;IACxB;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,YAAY,CAAC;CAC3B;AAED,MAAM,WAAW,cAAc;IAC9B;;;OAGG;IACH,QAAQ,CAAC,EAAE,WAAW,CAAC;CACvB;AAED;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,MAAO,SAAQ,SAAS,EAAE,cAAc;IACxD,IAAI,EAAE,QAAQ,CAAC;CACf;AAED,MAAM,WAAW,aAAc,SAAQ,SAAS,EAAE,cAAc;IAC/D;;;OAGG;IACH,aAAa,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,MAAO,SAAQ,aAAa;IAC5C,IAAI,EAAE,QAAQ,CAAC;CACf;AAED,MAAM,WAAW,YAAY;IAC5B;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,MAAO,SAAQ,cAAc,EAAE,YAAY;IAC3D,IAAI,EAAE,QAAQ,CAAC;IACf,EAAE,EAAE,gBAAgB,CAAC;CACrB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,OAAQ,SAAQ,aAAa,EAAE,YAAY;IAC3D,IAAI,EAAE,SAAS,CAAC;CAChB;AAED,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AAErC,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAEtC;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,eAAe;IAC/B,IAAI,EAAE,iBAAiB,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,MAAM;IACtB,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,eAAe,GAAG,MAAM,CAAC;AAE/E,MAAM,MAAM,QAAQ,CAAC,KAAK,IAAI,KAAK,GAAG,aAAa,CAAC;AAEpD,MAAM,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;AAExC,MAAM,MAAM,QAAQ,GAAG,IAAI,EAAE,CAAC;AAE9B,MAAM,MAAM,SAAS,GAAG,QAAQ,CAAC"}

package/lib/feature-libraries/sequence-field/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAyCH,MAAM,CAAC,MAAM,YAAY,GAAG,SAAS,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport type { ChangeAtomId, ChangesetLocalId, RevisionTag } from \"../../core/index.js\";\nimport type { NodeId } from \"../modular-schema/index.js\";\n\nexport type CellCount = number;\n\n/**\n * A monotonically increasing positive integer assigned to an individual mark within the changeset.\n * MoveIds are scoped to a single changeset, so referring to MoveIds across changesets requires\n * qualifying them by change tag.\n *\n * The uniqueness of IDs is leveraged to uniquely identify the matching move-out for a move-in/return and vice-versa.\n */\nexport type MoveId = ChangesetLocalId;\n\nexport interface HasMoveId {\n\t/**\n\t * The sequential ID assigned to a change within a transaction.\n\t */\n\tid: MoveId;\n}\n\nexport interface CellId extends ChangeAtomId {}\n\n/**\n * Mark which targets a range of existing cells instead of creating new cells.\n */\nexport interface HasMarkFields {\n\t/**\n\t * Describes the detach which last emptied the target cells,\n\t * or the attach which allocated the cells if the cells have never been filled.\n\t * Undefined if the target cells are not empty in this mark's input context.\n\t */\n\tcellId?: CellId;\n\n\tchanges?: NodeId;\n\n\tcount: CellCount;\n}\n\nexport const NoopMarkType = undefined;\nexport interface NoopMark {\n\t/**\n\t * Declared for consistency with other marks.\n\t * Left undefined for terseness.\n\t */\n\ttype?: typeof NoopMarkType;\n}\n\nexport interface HasRevisionTag {\n\t/**\n\t * The revision this mark is part of.\n\t */\n\trevision?: RevisionTag;\n}\n\n/**\n * Moves detached roots into cells.\n * The specific content being moved in is determined by the IDs of the cells this mark targets.\n * Always brings about the desired outcome: the content is in the targeted cells.\n *\n * Rebasing this mark never causes it to insert/restore a different set of nodes.\n * Rebasing this mark never causes it to fill a different set of cells\n * (though the way those cells are identified may change).\n *\n * Carries a `MoveId` in case it is rebased over the content being moved out, in which case this mark\n * will transform into a pair of returns which will move the content back into this cell.\n */\nexport interface Attach extends HasMoveId, HasRevisionTag {\n\ttype: \"Insert\";\n\n\t// XXX: Use this ID as main ID when serializing\n\t/**\n\t * This field should only be used if the attach is a pin.\n\t */\n\tdetachCellId?: ChangeAtomId;\n}\n\nexport interface HasMoveFields extends HasMoveId, HasRevisionTag {\n\t/**\n\t * Used when this mark represents the beginning or end of a chain of moves within a changeset.\n\t * If this mark is the start of the chain, this is the ID of the end mark of the chain, and vice-versa if this is the end of the chain.\n\t */\n\tfinalEndpoint?: ChangeAtomId;\n}\n\n/**\n * Removes nodes from their cells.\n * Always brings about the desired outcome: the targeted nodes are removed from their cells.\n * Note that this may not require any changes if targeted nodes are already removed when this mark is applied.\n *\n * Rebasing this mark never causes it to target different set of nodes.\n * Rebasing this mark can cause it to clear a different set of cells.\n */\nexport interface Detach extends HasRevisionTag {\n\treadonly type: \"Remove\";\n\treadonly id: ChangesetLocalId;\n\n\t/**\n\t * The ID the cell should be set to when this detach is applied.\n\t * If not set, this the same as the detach ID.\n\t * This applies to the cell where the node is being detached from,\n\t * or the last cell the node occupied if it is already detached.\n\t *\n\t * This field is used to represent the composition of a pin and a detach.\n\t * The composition will be the second detach but with the pin's detachId as detachCellId.\n\t */\n\tdetachCellId?: ChangeAtomId;\n\n\t/**\n\t * When set, this represents a rename of this cell to be applied after the detach.\n\t * Note that this does not affect the ID associated with the detached node.\n\t *\n\t * This is used in two situations:\n\t * - to restore the prior ID of a cell in a rollback changeset\n\t * - to represent the impact of a detach composed with a rename\n\t */\n\treadonly cellRename?: CellId;\n}\n\n/**\n * Represents the renaming of an empty cell.\n *\n * Only ever targets empty cells.\n *\n * Occurs when a MoveIn is composed with a MoveOut.\n * TODO: Use Rename when an Insert/Revive is composed with a Remove.\n */\nexport interface Rename {\n\ttype: \"Rename\";\n\treadonly idOverride: CellId;\n}\n\nexport interface Pin extends CellMark<Attach> {\n\tcellId: undefined;\n}\n\nexport type MarkEffect = NoopMark | Attach | Detach | Rename;\n\nexport type CellMark<TMark> = TMark & HasMarkFields;\n\nexport type Mark = CellMark<MarkEffect>;\n\nexport type MarkList = Mark[];\n\nexport type Changeset = MarkList;\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAyCH,MAAM,CAAC,MAAM,YAAY,GAAG,SAAS,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport type { ChangeAtomId, ChangesetLocalId, RevisionTag } from \"../../core/index.js\";\nimport type { NodeId } from \"../modular-schema/index.js\";\n\nexport type CellCount = number;\n\n/**\n * A monotonically increasing positive integer assigned to an individual mark within the changeset.\n * MoveIds are scoped to a single changeset, so referring to MoveIds across changesets requires\n * qualifying them by change tag.\n *\n * The uniqueness of IDs is leveraged to uniquely identify the matching move-out for a move-in/return and vice-versa.\n */\nexport type MoveId = ChangesetLocalId;\n\nexport interface HasMoveId {\n\t/**\n\t * The sequential ID assigned to a change within a transaction.\n\t */\n\tid: MoveId;\n}\n\nexport interface CellId extends ChangeAtomId {}\n\n/**\n * Mark which targets a range of existing cells instead of creating new cells.\n */\nexport interface HasMarkFields {\n\t/**\n\t * Describes the detach which last emptied the target cells,\n\t * or the attach which allocated the cells if the cells have never been filled.\n\t * Undefined if the target cells are not empty in this mark's input context.\n\t */\n\tcellId?: CellId;\n\n\tchanges?: NodeId;\n\n\tcount: CellCount;\n}\n\nexport const NoopMarkType = undefined;\nexport interface NoopMark {\n\t/**\n\t * Declared for consistency with other marks.\n\t * Left undefined for terseness.\n\t */\n\ttype?: typeof NoopMarkType;\n}\n\nexport interface HasRevisionTag {\n\t/**\n\t * The revision this mark is part of.\n\t * Only set for marks in fields which are a composition of multiple revisions.\n\t */\n\trevision?: RevisionTag;\n}\n\n/**\n * Moves detached roots into cells.\n * The specific content being moved in is determined by the IDs of the cells this mark targets.\n * Always brings about the desired outcome: the content is in the targeted cells.\n *\n * Rebasing this mark never causes it to insert/restore a different set of nodes.\n * Rebasing this mark never causes it to fill a different set of cells\n * (though the way those cells are identified may change).\n *\n * Carries a `MoveId` in case it is rebased over the content being moved out, in which case this mark\n * will transform into a pair of returns which will move the content back into this cell.\n */\nexport interface Insert extends HasMoveId, HasRevisionTag {\n\ttype: \"Insert\";\n}\n\nexport interface HasMoveFields extends HasMoveId, HasRevisionTag {\n\t/**\n\t * Used when this mark represents the beginning or end of a chain of moves within a changeset.\n\t * If this mark is the start of the chain, this is the ID of the end mark of the chain, and vice-versa if this is the end of the chain.\n\t */\n\tfinalEndpoint?: ChangeAtomId;\n}\n\n/**\n * Fills empty cells with content that is moved out from another cell.\n * Always brings about the desired outcome: the nodes being moved are in the target cells.\n * Note that this may not require any changes if these nodes are already in the target cells when this mark is applied.\n *\n * Rebasing this mark never causes it to move-in a different set of nodes.\n * Rebasing this mark never causes it to fill a different set of cells\n * (though the way those cells are identified may change).\n *\n * Only ever targets empty cells. It transforms into a idempotent Insert if the target cells are not empty.\n */\nexport interface MoveIn extends HasMoveFields {\n\ttype: \"MoveIn\";\n}\n\nexport interface DetachFields {\n\t/**\n\t * When set, the detach should use the `CellId` specified in this object to characterize the cell being emptied.\n\t *\n\t * This is used in two situations:\n\t * - to restore the prior ID of a cell in a rollback changeset\n\t * - to represent the impact of a detach composed with a rename\n\t */\n\treadonly idOverride?: CellId;\n}\n\n/**\n * Removes nodes from their cells.\n * Always brings about the desired outcome: the targeted nodes are removed from their cells.\n * Note that this may not require any changes if targeted nodes are already removed when this mark is applied.\n *\n * Rebasing this mark never causes it to target different set of nodes.\n * Rebasing this mark can cause it to clear a different set of cells.\n */\nexport interface Remove extends HasRevisionTag, DetachFields {\n\ttype: \"Remove\";\n\tid: ChangesetLocalId;\n}\n\n/**\n * Removes nodes from their cells so they can be moved into other cells.\n * Always brings about the desired outcome: the targeted nodes are removed from their cells.\n * Note that this may not require any changes if targeted nodes are already removed when this mark is applied.\n *\n * Rebasing this mark never causes it to target different set of nodes.\n * Rebasing this mark can cause it to clear a different set of cells.\n */\nexport interface MoveOut extends HasMoveFields, DetachFields {\n\ttype: \"MoveOut\";\n}\n\nexport type Attach = Insert | MoveIn;\n\nexport type Detach = Remove | MoveOut;\n\n/**\n * Fills then empties cells.\n *\n * Only ever targets empty cells.\n *\n * As a matter of normalization, we only use an AttachAndDetach to represent MoveIn ○ Remove.\n *\n * We do NOT use AttachAndDetach to represent the following compositions:\n * - Insert/Revive ○ Remove (represented by a Remove)\n * - Insert/Revive ○ MoveOut (represented by a MoveOut)\n * - MoveIn ○ MoveOut (represented by a Rename)\n */\nexport interface AttachAndDetach {\n\ttype: \"AttachAndDetach\";\n\tattach: Attach;\n\tdetach: Detach;\n}\n\n/**\n * Represents the renaming of an empty cell.\n *\n * Only ever targets empty cells.\n *\n * Occurs when a MoveIn is composed with a MoveOut.\n * TODO: Use Rename when an Insert/Revive is composed with a Remove.\n */\nexport interface Rename {\n\ttype: \"Rename\";\n\treadonly idOverride: CellId;\n}\n\nexport type MarkEffect = NoopMark | Attach | Detach | AttachAndDetach | Rename;\n\nexport type CellMark<TMark> = TMark & HasMarkFields;\n\nexport type Mark = CellMark<MarkEffect>;\n\nexport type MarkList = Mark[];\n\nexport type Changeset = MarkList;\n"]}

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

@@ -4,19 +4,19 @@
  */
 import { type ChangeAtomId, type ChangesetLocalId, type RevisionMetadataSource, type RevisionTag } from "../../core/index.js";
 import { type NodeId, type CrossFieldKeyRange, type NestedChangesIndices } from "../modular-schema/index.js";
-import type { DetachOfRemovedNodes, EmptyInputCellMark } from "./helperTypes.js";
-import { type Attach, type CellId, type CellMark, type Changeset, type Detach, type Mark, type MarkEffect, type NoopMark, type CellCount, type Rename, type Pin } from "./types.js";
+import type { CellRename, DetachOfRemovedNodes, EmptyInputCellMark, MoveMarkEffect } from "./helperTypes.js";
+import { type Attach, type AttachAndDetach, type CellId, type CellMark, type Changeset, type Detach, type Insert, type Mark, type MarkEffect, type NoopMark, type Remove, type CellCount, type Rename } from "./types.js";
 export declare function isEmpty(change: Changeset): boolean;
 export declare function createEmpty(): Changeset;
 export declare function getNestedChanges(change: Changeset): NestedChangesIndices;
 export declare function isNewAttach(mark: Mark, revision?: RevisionTag): boolean;
 export declare function isNewAttachEffect(effect: MarkEffect, cellId: CellId | undefined, revision?: RevisionTag): boolean;
 export declare function isRename(mark: MarkEffect): mark is Rename;
-export declare function isInsert(mark: MarkEffect): mark is Attach;
+export declare function isInsert(mark: MarkEffect): mark is Insert;
 export declare function isAttach(effect: MarkEffect): effect is Attach;
 export declare function isReattach(mark: Mark): boolean;
 export declare function isReattachEffect(effect: MarkEffect, cellId: CellId | undefined): boolean;
-export declare function isActiveReattach(mark: Mark): mark is CellMark<Attach> & {
+export declare function isActiveReattach(mark: Mark): mark is CellMark<Insert> & {
     conflictsWith?: undefined;
 };
 export declare function areEqualCellIds(a: CellId | undefined, b: CellId | undefined): boolean;
@@ -55,20 +55,19 @@ export declare function compareCellPositionsUsingTombstones(oldMarkCell: ChangeA
 /**
  * Gets the ID of the cell in the output context of the given detach `mark`.
  */
-export declare function getDetachOutputCellId(mark: Detach): ChangeAtomId;
-/**
- * Gets the ID of the node to be attached in the input context of the given detach `mark`.
- */
-export declare function getAttachedRootId(mark: Attach): ChangeAtomId;
+export declare function getDetachOutputCellId(mark: Detach | Rename): ChangeAtomId;
 /**
  * Gets the ID of the detached node in the output context of the given detach `mark`.
  */
-export declare function getDetachedRootId(mark: Detach): ChangeAtomId;
-export declare function getMovedNodeId(mark: Attach | Detach): ChangeAtomId;
+export declare function getDetachedNodeId(mark: Detach | Rename): ChangeAtomId;
 /**
  * Preserves the semantics of the given `mark` but repackages it into a `DetachOfRemovedNodes` when possible.
  */
-export declare function normalizeCellRename(cellId: CellId, count: CellCount, attach: Attach, detach: Detach): CellMark<DetachOfRemovedNodes | Rename | NoopMark>;
+export declare function normalizeCellRename(cellId: CellId, count: CellCount, attach: Attach, detach: Detach): CellMark<AttachAndDetach | DetachOfRemovedNodes | Rename | NoopMark>;
+/**
+ * Preserves the semantics of the given `mark` but repackages it into an `AttachAndDetach` mark if it is not already one.
+ */
+export declare function asAttachAndDetach(mark: CellMark<CellRename>): CellMark<AttachAndDetach>;
 export declare function cloneMark<TMark extends Mark>(mark: TMark): TMark;
 export declare function cloneMarkEffect<TEffect extends MarkEffect>(effect: TEffect): TEffect;
 export declare function cloneCellId(id: CellId): CellId;
@@ -87,8 +86,19 @@ export declare function getInputLength(mark: Mark): number;
 export declare function markEmptiesCells(mark: Mark): boolean;
 export declare function markFillsCells(mark: Mark): boolean;
 export declare function markHasCellEffect(mark: Mark): boolean;
+export declare function isAttachAndDetachEffect(effect: MarkEffect): effect is AttachAndDetach;
+export declare function isDetachOfRemovedNodes(mark: Mark): mark is CellMark<DetachOfRemovedNodes>;
+export declare function isImpactfulCellRename(mark: Mark): mark is CellMark<CellRename>;
 export declare function areInputCellsEmpty(mark: Mark): mark is EmptyInputCellMark;
 export declare function areOutputCellsEmpty(mark: Mark): boolean;
+/**
+ * Creates a mark that is equivalent to the given `mark` but with effects removed if those have no impact in the input
+ * context of that mark.
+ *
+ * @param mark - The mark to settle. Never mutated.
+ * @returns either the original mark or a shallow clone of it with effects stripped out.
+ */
+export declare function settleMark(mark: Mark): Mark;
 /**
  * Returns true if and only iff the given `mark` would have impact on the field when applied.
  *
@@ -104,9 +114,7 @@ export declare function isNoopMark(mark: Mark): mark is CellMark<NoopMark>;
 export declare function areOverlappingIdRanges(id1: ChangesetLocalId, count1: number, id2: ChangesetLocalId, count2: number): boolean;
 export declare function compareCellsFromSameRevision(cell1: CellId, count1: number, cell2: CellId, count2: number): number | undefined;
 export declare function isDetach(mark: MarkEffect | undefined): mark is Detach;
-export declare function isPin(mark: Mark): mark is Pin;
-export declare function isRemoveMark(mark: Mark | undefined): mark is CellMark<Detach>;
-export declare function areMergeableChangeAtoms(lhs: ChangeAtomId | undefined, lhsCount: number, rhs: ChangeAtomId | undefined): boolean;
+export declare function isRemoveMark(mark: Mark | undefined): mark is CellMark<Remove>;
 /**
  * Attempts to extend `lhs` to include the effects of `rhs`.
  * @param lhs - The mark to extend.
@@ -133,5 +141,6 @@ export declare function extractMarkEffect<TEffect extends MarkEffect>(mark: Cell
 export declare function omitMarkEffect(mark: CellMark<unknown>): CellMark<NoopMark>;
 export declare function withNodeChange<TMark extends CellMark<TKind>, TKind extends MarkEffect>(mark: TMark, changes: NodeId | undefined): TMark;
 export declare function withRevision<TMark extends Mark>(mark: TMark, revision: RevisionTag | undefined): TMark;
+export declare function getEndpoint(effect: MoveMarkEffect): ChangeAtomId;
 export declare function getCrossFieldKeys(change: Changeset): CrossFieldKeyRange[];
 //# sourceMappingURL=utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/utils.ts"],"names":[],"mappings":"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"}