@fluidframework/tree 2.82.0 → 2.90.0-378676

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

@@ -6,7 +6,6 @@ import { unreachableCase } from "@fluidframework/core-utils/internal";
 import { makeChangeAtomId, } from "../../core/index.js";
 import { MarkListFactory } from "./markListFactory.js";
 import { NoopMarkType, } from "./types.js";
-import { isDetach, isRename } from "./utils.js";
 export function replaceRevisions(changeset, replacer) {
     const updatedMarks = new MarkListFactory();
     for (const mark of changeset) {
@@ -16,59 +15,47 @@ export function replaceRevisions(changeset, replacer) {
     return updatedMarks.list;
 }
 function updateMark(mark, replacer) {
-    const updatedMark = { ...updateEffect(mark, mark.count, replacer) };
+    const updatedMark = { ...replaceEffectRevisions(mark, mark.count, replacer) };
     if (mark.cellId !== undefined) {
         updatedMark.cellId = replacer.getUpdatedAtomId(mark.cellId, mark.count);
     }
     if (mark.changes !== undefined) {
-        updatedMark.changes = replacer.getUpdatedAtomId(mark.changes);
+        updatedMark.changes = replacer.getUpdatedAtomId(mark.changes, mark.count);
     }
     return updatedMark;
 }
-function updateEffect(input, count, replacer) {
-    const mark = isDetach(input) || isRename(input) ? updateIdOverride(input, count, replacer) : input;
+function replaceEffectRevisions(mark, count, replacer) {
     const type = mark.type;
     switch (type) {
-        case "Rename":
         case NoopMarkType: {
             return mark;
         }
-        case "AttachAndDetach": {
+        case "Attach": {
+            return updateRevisionAndId(mark, count, replacer);
+        }
+        case "Detach": {
+            return replaceDetachRevisions(mark, count, replacer);
+        }
+        case "Rename": {
             return {
                 ...mark,
-                attach: updateEffect(mark.attach, count, replacer),
-                detach: updateEffect(mark.detach, count, replacer),
+                idOverride: replacer.getUpdatedAtomId(mark.idOverride, count),
             };
         }
-        case "MoveIn":
-        case "MoveOut": {
-            return updateMoveEffect(
-            // For some reason, TypeScript is not able to infer that `mark` cannot be a `NoopMark` here.
-            mark, count, replacer);
-        }
-        case "Insert":
-        case "Remove": {
-            return updateRevisionAndId(mark, count, replacer);
-        }
         default: {
             unreachableCase(type);
         }
     }
 }
-function updateIdOverride(effect, count, replacer) {
-    if (effect.idOverride === undefined) {
-        return effect;
+function replaceDetachRevisions(detach, count, replacer) {
+    const updated = updateRevisionAndId(detach, count, replacer);
+    if (updated.cellRename !== undefined) {
+        updated.cellRename = replacer.getUpdatedAtomId(updated.cellRename, count);
     }
-    const idOverride = replacer.getUpdatedAtomId(effect.idOverride, count);
-    return { ...effect, idOverride };
-}
-function updateMoveEffect(effect, count, replacer) {
-    return effect.finalEndpoint === undefined
-        ? updateRevisionAndId(effect, count, replacer)
-        : updateRevisionAndId({
-            ...effect,
-            finalEndpoint: replacer.getUpdatedAtomId(effect.finalEndpoint, count),
-        }, count, replacer);
+    if (updated.detachCellId !== undefined) {
+        updated.detachCellId = replacer.getUpdatedAtomId(updated.detachCellId, count);
+    }
+    return updated;
 }
 function updateRevisionAndId(input, count, replacer) {
     if (!replacer.isObsolete(input.revision)) {

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

@@ -1 +1 @@
-{"version":3,"file":"replaceRevisions.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/replaceRevisions.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { unreachableCase } from \"@fluidframework/core-utils/internal\";\n\nimport {\n\tmakeChangeAtomId,\n\ttype ChangesetLocalId,\n\ttype RevisionReplacer,\n\ttype RevisionTag,\n} from \"../../core/index.js\";\n\nimport type { MoveMarkEffect } from \"./helperTypes.js\";\nimport { MarkListFactory } from \"./markListFactory.js\";\nimport {\n\ttype Changeset,\n\ttype Detach,\n\ttype HasMoveFields,\n\ttype HasMoveId,\n\ttype HasRevisionTag,\n\ttype Insert,\n\ttype Mark,\n\ttype MarkEffect,\n\tNoopMarkType,\n\ttype Remove,\n\ttype Rename,\n} from \"./types.js\";\nimport { isDetach, isRename } from \"./utils.js\";\n\nexport function replaceRevisions(changeset: Changeset, replacer: RevisionReplacer): Changeset {\n\tconst updatedMarks = new MarkListFactory();\n\tfor (const mark of changeset) {\n\t\tconst updatedMark = updateMark(mark, replacer);\n\t\tupdatedMarks.push(updatedMark);\n\t}\n\n\treturn updatedMarks.list;\n}\n\nfunction updateMark(mark: Mark, replacer: RevisionReplacer): Mark {\n\tconst updatedMark = { ...updateEffect(mark, mark.count, replacer) };\n\tif (mark.cellId !== undefined) {\n\t\tupdatedMark.cellId = replacer.getUpdatedAtomId(mark.cellId, mark.count);\n\t}\n\n\tif (mark.changes !== undefined) {\n\t\tupdatedMark.changes = replacer.getUpdatedAtomId(mark.changes);\n\t}\n\n\treturn updatedMark;\n}\n\nfunction updateEffect<TMark extends MarkEffect>(\n\tinput: TMark,\n\tcount: number,\n\treplacer: RevisionReplacer,\n): TMark {\n\tconst mark =\n\t\tisDetach(input) || isRename(input) ? updateIdOverride(input, count, replacer) : input;\n\tconst type = mark.type;\n\tswitch (type) {\n\t\tcase \"Rename\":\n\t\tcase NoopMarkType: {\n\t\t\treturn mark;\n\t\t}\n\t\tcase \"AttachAndDetach\": {\n\t\t\treturn {\n\t\t\t\t...mark,\n\t\t\t\tattach: updateEffect(mark.attach, count, replacer),\n\t\t\t\tdetach: updateEffect(mark.detach, count, replacer),\n\t\t\t};\n\t\t}\n\t\tcase \"MoveIn\":\n\t\tcase \"MoveOut\": {\n\t\t\treturn updateMoveEffect<TMark & MoveMarkEffect>(\n\t\t\t\t// For some reason, TypeScript is not able to infer that `mark` cannot be a `NoopMark` here.\n\t\t\t\tmark as MoveMarkEffect,\n\t\t\t\tcount,\n\t\t\t\treplacer,\n\t\t\t);\n\t\t}\n\t\tcase \"Insert\":\n\t\tcase \"Remove\": {\n\t\t\treturn updateRevisionAndId(mark as (TMark & Insert) | (TMark & Remove), count, replacer);\n\t\t}\n\t\tdefault: {\n\t\t\tunreachableCase(type);\n\t\t}\n\t}\n}\n\nfunction updateIdOverride<TEffect extends Detach | Rename>(\n\teffect: TEffect,\n\tcount: number,\n\treplacer: RevisionReplacer,\n): TEffect {\n\tif (effect.idOverride === undefined) {\n\t\treturn effect;\n\t}\n\tconst idOverride = replacer.getUpdatedAtomId(effect.idOverride, count);\n\treturn { ...effect, idOverride };\n}\n\nfunction updateMoveEffect<TEffect extends HasMoveFields>(\n\teffect: TEffect,\n\tcount: number,\n\treplacer: RevisionReplacer,\n): TEffect {\n\treturn effect.finalEndpoint === undefined\n\t\t? updateRevisionAndId(effect, count, replacer)\n\t\t: updateRevisionAndId(\n\t\t\t\t{\n\t\t\t\t\t...effect,\n\t\t\t\t\tfinalEndpoint: replacer.getUpdatedAtomId(effect.finalEndpoint, count),\n\t\t\t\t},\n\t\t\t\tcount,\n\t\t\t\treplacer,\n\t\t\t);\n}\n\nfunction updateRevisionAndId<T extends HasRevisionTag & HasMoveId>(\n\tinput: T,\n\tcount: number,\n\treplacer: RevisionReplacer,\n): T {\n\tif (!replacer.isObsolete(input.revision)) {\n\t\treturn input;\n\t}\n\tconst newAtom = replacer.getUpdatedAtomId(makeChangeAtomId(input.id, input.revision), count);\n\treturn withRevisionAndId(input, newAtom.revision, newAtom.localId);\n}\n\nfunction withRevisionAndId<T extends HasRevisionTag>(\n\tinput: T,\n\trevision: RevisionTag | undefined,\n\tid: ChangesetLocalId,\n): T {\n\tconst updated = { ...input, revision, id };\n\tif (revision === undefined) {\n\t\tdelete updated.revision;\n\t}\n\n\treturn updated;\n}\n"]}
+{"version":3,"file":"replaceRevisions.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/replaceRevisions.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { unreachableCase } from \"@fluidframework/core-utils/internal\";\n\nimport {\n\tmakeChangeAtomId,\n\ttype ChangesetLocalId,\n\ttype RevisionReplacer,\n\ttype RevisionTag,\n} from \"../../core/index.js\";\nimport type { Mutable } from \"../../util/index.js\";\n\nimport { MarkListFactory } from \"./markListFactory.js\";\nimport {\n\ttype Attach,\n\ttype Changeset,\n\ttype Detach,\n\ttype HasMoveId,\n\ttype HasRevisionTag,\n\ttype Mark,\n\ttype MarkEffect,\n\tNoopMarkType,\n} from \"./types.js\";\n\nexport function replaceRevisions(changeset: Changeset, replacer: RevisionReplacer): Changeset {\n\tconst updatedMarks = new MarkListFactory();\n\tfor (const mark of changeset) {\n\t\tconst updatedMark = updateMark(mark, replacer);\n\t\tupdatedMarks.push(updatedMark);\n\t}\n\n\treturn updatedMarks.list;\n}\n\nfunction updateMark(mark: Mark, replacer: RevisionReplacer): Mark {\n\tconst updatedMark = { ...replaceEffectRevisions(mark, mark.count, replacer) };\n\tif (mark.cellId !== undefined) {\n\t\tupdatedMark.cellId = replacer.getUpdatedAtomId(mark.cellId, mark.count);\n\t}\n\n\tif (mark.changes !== undefined) {\n\t\tupdatedMark.changes = replacer.getUpdatedAtomId(mark.changes, mark.count);\n\t}\n\n\treturn updatedMark;\n}\n\nfunction replaceEffectRevisions<TMark extends MarkEffect>(\n\tmark: TMark,\n\tcount: number,\n\treplacer: RevisionReplacer,\n): TMark {\n\tconst type = mark.type;\n\tswitch (type) {\n\t\tcase NoopMarkType: {\n\t\t\treturn mark;\n\t\t}\n\t\tcase \"Attach\": {\n\t\t\treturn updateRevisionAndId(mark as TMark & Attach, count, replacer);\n\t\t}\n\n\t\tcase \"Detach\": {\n\t\t\treturn replaceDetachRevisions<TMark & Detach>(mark as Detach & TMark, count, replacer);\n\t\t}\n\t\tcase \"Rename\": {\n\t\t\treturn {\n\t\t\t\t...mark,\n\t\t\t\tidOverride: replacer.getUpdatedAtomId(mark.idOverride, count),\n\t\t\t};\n\t\t}\n\t\tdefault: {\n\t\t\tunreachableCase(type);\n\t\t}\n\t}\n}\n\nfunction replaceDetachRevisions<TDetach extends Detach>(\n\tdetach: TDetach,\n\tcount: number,\n\treplacer: RevisionReplacer,\n): TDetach {\n\tconst updated = updateRevisionAndId(detach, count, replacer) as Mutable<TDetach>;\n\tif (updated.cellRename !== undefined) {\n\t\tupdated.cellRename = replacer.getUpdatedAtomId(updated.cellRename, count);\n\t}\n\n\tif (updated.detachCellId !== undefined) {\n\t\tupdated.detachCellId = replacer.getUpdatedAtomId(updated.detachCellId, count);\n\t}\n\n\treturn updated;\n}\n\nfunction updateRevisionAndId<T extends HasRevisionTag & HasMoveId>(\n\tinput: T,\n\tcount: number,\n\treplacer: RevisionReplacer,\n): T {\n\tif (!replacer.isObsolete(input.revision)) {\n\t\treturn input;\n\t}\n\tconst newAtom = replacer.getUpdatedAtomId(makeChangeAtomId(input.id, input.revision), count);\n\treturn withRevisionAndId(input, newAtom.revision, newAtom.localId);\n}\n\nfunction withRevisionAndId<T extends HasRevisionTag>(\n\tinput: T,\n\trevision: RevisionTag | undefined,\n\tid: ChangesetLocalId,\n): T {\n\tconst updated = { ...input, revision, id };\n\tif (revision === undefined) {\n\t\tdelete updated.revision;\n\t}\n\n\treturn updated;\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"sequenceFieldChangeHandler.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/sequenceFieldChangeHandler.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAKrE,OAAO,EAAE,KAAK,mBAAmB,EAAuB,MAAM,0BAA0B,CAAC;AAEzF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAG5C,MAAM,MAAM,0BAA0B,GAAG,kBAAkB,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;AAE5F,eAAO,MAAM,0BAA0B,EAAE,0BAUxC,CAAC"}
+{"version":3,"file":"sequenceFieldChangeHandler.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/sequenceFieldChangeHandler.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAIrE,OAAO,EAAE,KAAK,mBAAmB,EAAuB,MAAM,0BAA0B,CAAC;AAEzF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAS5C,MAAM,MAAM,0BAA0B,GAAG,kBAAkB,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;AAE5F,eAAO,MAAM,0BAA0B,EAAE,0BAUxC,CAAC"}

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

@@ -2,21 +2,20 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { relevantRemovedRoots } from "./relevantRemovedRoots.js";
 import { sequenceFieldChangeRebaser } from "./sequenceFieldChangeRebaser.js";
 import { sequenceFieldChangeCodecFactory } from "./sequenceFieldCodecs.js";
 import { sequenceFieldEditor } from "./sequenceFieldEditor.js";
 import { sequenceFieldToDelta } from "./sequenceFieldToDelta.js";
-import { createEmpty, getCrossFieldKeys, getNestedChanges, isEmpty } from "./utils.js";
+import { createEmpty, getCrossFieldKeys, getDetachCellIds, getNestedChanges, isEmpty, } from "./utils.js";
 export const sequenceFieldChangeHandler = {
     rebaser: sequenceFieldChangeRebaser,
     codecsFactory: sequenceFieldChangeCodecFactory,
     editor: sequenceFieldEditor,
     intoDelta: sequenceFieldToDelta,
-    relevantRemovedRoots,
     isEmpty,
     getNestedChanges,
     createEmpty,
     getCrossFieldKeys,
+    getDetachCellIds,
 };
 //# sourceMappingURL=sequenceFieldChangeHandler.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"sequenceFieldChangeHandler.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/sequenceFieldChangeHandler.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,+BAA+B,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAA4B,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAIvF,MAAM,CAAC,MAAM,0BAA0B,GAA+B;IACrE,OAAO,EAAE,0BAA0B;IACnC,aAAa,EAAE,+BAA+B;IAC9C,MAAM,EAAE,mBAAmB;IAC3B,SAAS,EAAE,oBAAoB;IAC/B,oBAAoB;IACpB,OAAO;IACP,gBAAgB;IAChB,WAAW;IACX,iBAAiB;CACjB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport type { FieldChangeHandler } from \"../modular-schema/index.js\";\n\nimport { relevantRemovedRoots } from \"./relevantRemovedRoots.js\";\nimport { sequenceFieldChangeRebaser } from \"./sequenceFieldChangeRebaser.js\";\nimport { sequenceFieldChangeCodecFactory } from \"./sequenceFieldCodecs.js\";\nimport { type SequenceFieldEditor, sequenceFieldEditor } from \"./sequenceFieldEditor.js\";\nimport { sequenceFieldToDelta } from \"./sequenceFieldToDelta.js\";\nimport type { Changeset } from \"./types.js\";\nimport { createEmpty, getCrossFieldKeys, getNestedChanges, isEmpty } from \"./utils.js\";\n\nexport type SequenceFieldChangeHandler = FieldChangeHandler<Changeset, SequenceFieldEditor>;\n\nexport const sequenceFieldChangeHandler: SequenceFieldChangeHandler = {\n\trebaser: sequenceFieldChangeRebaser,\n\tcodecsFactory: sequenceFieldChangeCodecFactory,\n\teditor: sequenceFieldEditor,\n\tintoDelta: sequenceFieldToDelta,\n\trelevantRemovedRoots,\n\tisEmpty,\n\tgetNestedChanges,\n\tcreateEmpty,\n\tgetCrossFieldKeys,\n};\n"]}
+{"version":3,"file":"sequenceFieldChangeHandler.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/sequenceFieldChangeHandler.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,+BAA+B,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAA4B,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,EACN,WAAW,EACX,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,OAAO,GACP,MAAM,YAAY,CAAC;AAIpB,MAAM,CAAC,MAAM,0BAA0B,GAA+B;IACrE,OAAO,EAAE,0BAA0B;IACnC,aAAa,EAAE,+BAA+B;IAC9C,MAAM,EAAE,mBAAmB;IAC3B,SAAS,EAAE,oBAAoB;IAC/B,OAAO;IACP,gBAAgB;IAChB,WAAW;IACX,iBAAiB;IACjB,gBAAgB;CAChB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport type { FieldChangeHandler } from \"../modular-schema/index.js\";\n\nimport { sequenceFieldChangeRebaser } from \"./sequenceFieldChangeRebaser.js\";\nimport { sequenceFieldChangeCodecFactory } from \"./sequenceFieldCodecs.js\";\nimport { type SequenceFieldEditor, sequenceFieldEditor } from \"./sequenceFieldEditor.js\";\nimport { sequenceFieldToDelta } from \"./sequenceFieldToDelta.js\";\nimport type { Changeset } from \"./types.js\";\nimport {\n\tcreateEmpty,\n\tgetCrossFieldKeys,\n\tgetDetachCellIds,\n\tgetNestedChanges,\n\tisEmpty,\n} from \"./utils.js\";\n\nexport type SequenceFieldChangeHandler = FieldChangeHandler<Changeset, SequenceFieldEditor>;\n\nexport const sequenceFieldChangeHandler: SequenceFieldChangeHandler = {\n\trebaser: sequenceFieldChangeRebaser,\n\tcodecsFactory: sequenceFieldChangeCodecFactory,\n\teditor: sequenceFieldEditor,\n\tintoDelta: sequenceFieldToDelta,\n\tisEmpty,\n\tgetNestedChanges,\n\tcreateEmpty,\n\tgetCrossFieldKeys,\n\tgetDetachCellIds,\n};\n"]}

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

@@ -2,13 +2,31 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
+import type { TAnySchema } from "@sinclair/typebox";
 import { type IJsonCodec } from "../../codec/index.js";
-import type { ChangeEncodingContext, EncodedRevisionTag, RevisionTag } from "../../core/index.js";
+import { type ChangeAtomId, type ChangeEncodingContext, type EncodedRevisionTag, type RevisionTag } from "../../core/index.js";
 import { type JsonCompatibleReadOnly } from "../../util/index.js";
-import { type FieldChangeEncodingContext } from "../modular-schema/index.js";
+import { type EncodedChangeAtomId, type FieldChangeEncodingContext } from "../modular-schema/index.js";
 import { type Encoded } from "./formatV2.js";
 import type { SequenceCodecHelpers } from "./helperTypes.js";
-import { type Changeset, type MarkEffect } from "./types.js";
-export declare function makeV2CodecHelpers(revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>): SequenceCodecHelpers<MarkEffect, Encoded.MarkEffect>;
+import { type Changeset, type Mark, type MarkEffect } from "./types.js";
+export declare function makeV2CodecHelpers(revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>): SequenceCodecHelpers;
+export type DecodeMarkEffect = (encoded: Encoded.MarkEffect, count: number, cellId: ChangeAtomId | undefined, context: FieldChangeEncodingContext) => MarkEffect;
+export declare function decodeSequenceChangeset(changeset: Encoded.Changeset<NodeChangeSchema>, context: FieldChangeEncodingContext, changeAtomIdCodec: IJsonCodec<ChangeAtomId, EncodedChangeAtomId, EncodedChangeAtomId, ChangeEncodingContext>, decodeMarkEffect: DecodeMarkEffect): Changeset;
+/**
+ * If we want to make the node change aspect of this codec more type-safe, we could adjust generics
+ * to be in terms of the schema rather than the concrete type of the node change.
+ */
+type NodeChangeSchema = TAnySchema;
 export declare function makeV2Codec(revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>): IJsonCodec<Changeset, JsonCompatibleReadOnly, JsonCompatibleReadOnly, FieldChangeEncodingContext>;
+export declare function encodeSequenceChangeset(changeset: Changeset, context: FieldChangeEncodingContext, encodeRevision: (revision: RevisionTag | undefined) => EncodedRevisionTag | undefined, changeAtomIdCodec: IJsonCodec<ChangeAtomId, EncodedChangeAtomId, EncodedChangeAtomId, ChangeEncodingContext>, encodeMarkEffect: EncodeMarkEffect): JsonCompatibleReadOnly & Encoded.Changeset<NodeChangeSchema>;
+type EncodeMarkEffect = (mark: Mark, context: FieldChangeEncodingContext, encodeRevision: (revision: RevisionTag | undefined) => EncodedRevisionTag | undefined, changeAtomIdCodec: IJsonCodec<ChangeAtomId, EncodedChangeAtomId, EncodedChangeAtomId, ChangeEncodingContext>) => Encoded.MarkEffect;
+export declare function encodeRevisionWithContext(revision: RevisionTag | undefined, context: ChangeEncodingContext, revisionTagCodec: IJsonCodec<RevisionTag, EncodedRevisionTag, EncodedRevisionTag, ChangeEncodingContext>): EncodedRevisionTag | undefined;
+/**
+ * If the encoded mark effect represents a simple cell rename (with no effect on root nodes),
+ * returns the encoded form of the ID the cell is being renamed to,
+ * and otherwise returns undefined.
+ */
+export declare function tryGetEncodedCellRename(encoded: Encoded.MarkEffect): EncodedChangeAtomId | undefined;
+export {};
 //# sourceMappingURL=sequenceFieldCodecV2.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"sequenceFieldCodecV2.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/sequenceFieldCodecV2.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EAGN,KAAK,UAAU,EACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EACX,qBAAqB,EAErB,kBAAkB,EAClB,WAAW,EACX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,sBAAsB,EAAuB,MAAM,qBAAqB,CAAC;AAEvF,OAAO,EAEN,KAAK,0BAA0B,EAC/B,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAgC,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAC3E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAGN,KAAK,SAAS,EAId,KAAK,UAAU,EAMf,MAAM,YAAY,CAAC;AAGpB,wBAAgB,kBAAkB,CACjC,gBAAgB,EAAE,UAAU,CAC3B,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,CACrB,GACC,oBAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,CAiNtD;AAED,wBAAgB,WAAW,CAC1B,gBAAgB,EAAE,UAAU,CAC3B,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,CACrB,GACC,UAAU,CACZ,SAAS,EACT,sBAAsB,EACtB,sBAAsB,EACtB,0BAA0B,CAC1B,CAsEA"}
+{"version":3,"file":"sequenceFieldCodecV2.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/sequenceFieldCodecV2.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAGN,KAAK,UAAU,EACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEN,KAAK,YAAY,EACjB,KAAK,qBAAqB,EAE1B,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAChB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,sBAAsB,EAAuB,MAAM,qBAAqB,CAAC;AAGvF,OAAO,EAEN,KAAK,mBAAmB,EACxB,KAAK,0BAA0B,EAC/B,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAgC,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAC3E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAGN,KAAK,SAAS,EAEd,KAAK,IAAI,EACT,KAAK,UAAU,EAGf,MAAM,YAAY,CAAC;AAGpB,wBAAgB,kBAAkB,CACjC,gBAAgB,EAAE,UAAU,CAC3B,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,CACrB,GACC,oBAAoB,CA0DtB;AAED,MAAM,MAAM,gBAAgB,GAAG,CAC9B,OAAO,EAAE,OAAO,CAAC,UAAU,EAC3B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,YAAY,GAAG,SAAS,EAChC,OAAO,EAAE,0BAA0B,KAC/B,UAAU,CAAC;AAEhB,wBAAgB,uBAAuB,CACtC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAC9C,OAAO,EAAE,0BAA0B,EACnC,iBAAiB,EAAE,UAAU,CAC5B,YAAY,EACZ,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,CACrB,EACD,gBAAgB,EAAE,gBAAgB,GAChC,SAAS,CA6BX;AA4MD;;;GAGG;AACH,KAAK,gBAAgB,GAAG,UAAU,CAAC;AAEnC,wBAAgB,WAAW,CAC1B,gBAAgB,EAAE,UAAU,CAC3B,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,CACrB,GACC,UAAU,CACZ,SAAS,EACT,sBAAsB,EACtB,sBAAsB,EACtB,0BAA0B,CAC1B,CAuBA;AAED,wBAAgB,uBAAuB,CACtC,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,0BAA0B,EACnC,cAAc,EAAE,CAAC,QAAQ,EAAE,WAAW,GAAG,SAAS,KAAK,kBAAkB,GAAG,SAAS,EACrF,iBAAiB,EAAE,UAAU,CAC5B,YAAY,EACZ,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,CACrB,EACD,gBAAgB,EAAE,gBAAgB,GAChC,sBAAsB,GAAG,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAQ9D;AA4MD,KAAK,gBAAgB,GAAG,CACvB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,EACnC,cAAc,EAAE,CAAC,QAAQ,EAAE,WAAW,GAAG,SAAS,KAAK,kBAAkB,GAAG,SAAS,EACrF,iBAAiB,EAAE,UAAU,CAC5B,YAAY,EACZ,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,CACrB,KACG,OAAO,CAAC,UAAU,CAAC;AAiHxB,wBAAgB,yBAAyB,CACxC,QAAQ,EAAE,WAAW,GAAG,SAAS,EACjC,OAAO,EAAE,qBAAqB,EAC9B,gBAAgB,EAAE,UAAU,CAC3B,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,CACrB,GACC,kBAAkB,GAAG,SAAS,CAIhC;AAOD;;;;GAIG;AACH,wBAAgB,uBAAuB,CACtC,OAAO,EAAE,OAAO,CAAC,UAAU,GACzB,mBAAmB,GAAG,SAAS,CAKjC"}