@fluidframework/tree 2.0.0-rc.2.0.2 → 2.0.0-rc.3.0.0

package/dist/feature-libraries/sequence-field/moveEffectTable.d.ts

@@ -3,20 +3,20 @@
  * Licensed under the MIT License.
  */
 import { ChangeAtomId, RevisionTag, TaggedChange } from "../../core/index.js";
-import { CrossFieldManager, CrossFieldTarget } from "../modular-schema/index.js";
 import { RangeQueryResult } from "../../util/index.js";
-import { CellMark, Mark, MarkEffect, MoveId, MoveIn, MoveOut } from "./types.js";
+import { CrossFieldManager, CrossFieldTarget, NodeId } from "../modular-schema/index.js";
 import { MoveMarkEffect } from "./helperTypes.js";
-export type MoveEffectTable<T> = CrossFieldManager<MoveEffect<T>>;
+import { CellMark, Mark, MarkEffect, MoveId, MoveIn, MoveOut } from "./types.js";
+export type MoveEffectTable = CrossFieldManager<MoveEffect>;
 /**
  * Changes to be applied to a move mark.
  */
-export interface MoveEffect<T> {
+export interface MoveEffect {
     /**
      * Node changes which should be applied to this mark.
      * If this mark already has node changes, `modifyAfter` should be composed as later changes.
      */
-    modifyAfter?: T;
+    modifyAfter?: NodeId;
     /**
      * Only used during rebasing.
      * An effect from changeset being rebased which should be moved to the same position as this mark.
@@ -25,29 +25,40 @@ export interface MoveEffect<T> {
     /**
      * Rebased changes for a node which has been moved to the position of this mark.
      */
-    rebasedChanges?: T;
+    rebasedChanges?: NodeId;
     /**
-     * The ID of the new endpoint associated with this mark.
+     * The ID of the other outer endpoint.
+     * Used when this is the outer endpoint in a move chain which is being composed with another move chain.
      */
     endpoint?: ChangeAtomId;
+    /**
+     * The ID of the truncated endpoint.
+     * Used when this mark is the outer endpoint of a chain being composed with a redundant move chain.
+     */
+    truncatedEndpoint?: ChangeAtomId;
+    /**
+     * The ID of the truncated endpoint.
+     * Used when this mark is the inner endpoint of a redundant move chain.
+     */
+    truncatedEndpointForInner?: ChangeAtomId;
 }
 export declare enum MoveEnd {
     Source = 0,
     Dest = 1
 }
-export interface MovePartition<TNodeChange> {
+export interface MovePartition {
     id: MoveId;
     count?: number;
-    replaceWith?: Mark<TNodeChange>[];
-    modifyAfter?: TaggedChange<TNodeChange>;
+    replaceWith?: Mark[];
+    modifyAfter?: TaggedChange<NodeId>;
 }
-export declare function setMoveEffect<T>(moveEffects: MoveEffectTable<T>, target: CrossFieldTarget, revision: RevisionTag | undefined, id: MoveId, count: number, effect: MoveEffect<T>, invalidate?: boolean): void;
-export declare function getMoveEffect<T>(moveEffects: MoveEffectTable<T>, target: CrossFieldTarget, revision: RevisionTag | undefined, id: MoveId, count: number, addDependency?: boolean): RangeQueryResult<MoveEffect<T>>;
-export type MoveMark<T> = CellMark<MoveMarkEffect, T>;
+export declare function setMoveEffect(moveEffects: MoveEffectTable, target: CrossFieldTarget, revision: RevisionTag | undefined, id: MoveId, count: number, effect: MoveEffect, invalidate?: boolean): void;
+export declare function getMoveEffect(moveEffects: MoveEffectTable, target: CrossFieldTarget, revision: RevisionTag | undefined, id: MoveId, count: number, addDependency?: boolean): RangeQueryResult<MoveEffect>;
+export type MoveMark = CellMark<MoveMarkEffect>;
 export declare function isMoveMark(effect: MarkEffect): effect is MoveMarkEffect;
 export declare function isMoveOut(effect: MarkEffect): effect is MoveOut;
 export declare function isMoveIn(effect: MarkEffect): effect is MoveIn;
 export declare function getMoveIn(effect: MarkEffect): MoveIn | undefined;
-export declare function splitMarkForMoveEffects<T>(mark: Mark<T>, revision: RevisionTag | undefined, effects: MoveEffectTable<T>): Mark<T>[];
+export declare function splitMarkForMoveEffects(mark: Mark, revision: RevisionTag | undefined, effects: MoveEffectTable): Mark[];
 export declare function getCrossFieldTargetFromMove(mark: MoveMarkEffect): CrossFieldTarget;
 //# sourceMappingURL=moveEffectTable.d.ts.map

package/dist/feature-libraries/sequence-field/moveEffectTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"moveEffectTable.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/moveEffectTable.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAS,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAEjF,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAElE;;GAEG;AACH,MAAM,WAAW,UAAU,CAAC,CAAC;IAC5B;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,CAAC;IAEhB;;;OAGG;IACH,WAAW,CAAC,EAAE,UAAU,CAAC;IAEzB;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,CAAC;IAEnB;;OAEG;IACH,QAAQ,CAAC,EAAE,YAAY,CAAC;CACxB;AAUD,oBAAY,OAAO;IAClB,MAAM,IAAA;IACN,IAAI,IAAA;CACJ;AAED,MAAM,WAAW,aAAa,CAAC,WAAW;IACzC,EAAE,EAAE,MAAM,CAAC;IAGX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;IAClC,WAAW,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;CACxC;AAED,wBAAgB,aAAa,CAAC,CAAC,EAC9B,WAAW,EAAE,eAAe,CAAC,CAAC,CAAC,EAC/B,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,WAAW,GAAG,SAAS,EACjC,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,EACrB,UAAU,GAAE,OAAc,QAI1B;AAED,wBAAgB,aAAa,CAAC,CAAC,EAC9B,WAAW,EAAE,eAAe,CAAC,CAAC,CAAC,EAC/B,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,WAAW,GAAG,SAAS,EACjC,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,EACb,aAAa,GAAE,OAAc,GAC3B,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAKjC;AAED,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;AAEtD,wBAAgB,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,IAAI,cAAc,CAEvE;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,IAAI,OAAO,CAE/D;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,IAAI,MAAM,CAE7D;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,GAAG,SAAS,CAShE;AA0BD,wBAAgB,uBAAuB,CAAC,CAAC,EACxC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EACb,QAAQ,EAAE,WAAW,GAAG,SAAS,EACjC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,GACzB,IAAI,CAAC,CAAC,CAAC,EAAE,CAGX;AA0BD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,cAAc,GAAG,gBAAgB,CAUlF"}
+{"version":3,"file":"moveEffectTable.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/moveEffectTable.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAS,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAEzF,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAGjF,MAAM,MAAM,eAAe,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;AAE5D;;GAEG;AACH,MAAM,WAAW,UAAU;IAC1B;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,WAAW,CAAC,EAAE,UAAU,CAAC;IAEzB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,YAAY,CAAC;IAEjC;;;OAGG;IACH,yBAAyB,CAAC,EAAE,YAAY,CAAC;CACzC;AAUD,oBAAY,OAAO;IAClB,MAAM,IAAA;IACN,IAAI,IAAA;CACJ;AAED,MAAM,WAAW,aAAa;IAC7B,EAAE,EAAE,MAAM,CAAC;IAGX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,IAAI,EAAE,CAAC;IACrB,WAAW,CAAC,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;CACnC;AAED,wBAAgB,aAAa,CAC5B,WAAW,EAAE,eAAe,EAC5B,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,WAAW,GAAG,SAAS,EACjC,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,UAAU,EAClB,UAAU,GAAE,OAAc,QAI1B;AAED,wBAAgB,aAAa,CAC5B,WAAW,EAAE,eAAe,EAC5B,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,WAAW,GAAG,SAAS,EACjC,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,EACb,aAAa,GAAE,OAAc,GAC3B,gBAAgB,CAAC,UAAU,CAAC,CAK9B;AAED,MAAM,MAAM,QAAQ,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAC;AAEhD,wBAAgB,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,IAAI,cAAc,CAEvE;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,IAAI,OAAO,CAE/D;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,IAAI,MAAM,CAE7D;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,GAAG,SAAS,CAShE;AAkCD,wBAAgB,uBAAuB,CACtC,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,WAAW,GAAG,SAAS,EACjC,OAAO,EAAE,eAAe,GACtB,IAAI,EAAE,CAGR;AA0BD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,cAAc,GAAG,gBAAgB,CAUlF"}

package/dist/feature-libraries/sequence-field/moveEffectTable.js

@@ -5,9 +5,9 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCrossFieldTargetFromMove = exports.splitMarkForMoveEffects = exports.getMoveIn = exports.isMoveIn = exports.isMoveOut = exports.isMoveMark = exports.getMoveEffect = exports.setMoveEffect = exports.MoveEnd = void 0;
-const core_utils_1 = require("@fluidframework/core-utils");
-const index_js_1 = require("../modular-schema/index.js");
-const index_js_2 = require("../../util/index.js");
+const internal_1 = require("@fluidframework/core-utils/internal");
+const index_js_1 = require("../../util/index.js");
+const index_js_2 = require("../modular-schema/index.js");
 const utils_js_1 = require("./utils.js");
 var MoveEnd;
 (function (MoveEnd) {
@@ -55,12 +55,15 @@ function adjustMoveEffectBasis(effect, newBasis) {
     }
     const adjusted = { ...effect, basis: newBasis };
     const basisShift = newBasis - effect.basis;
-    (0, core_utils_1.assert)(basisShift > 0, 0x812 /* Expected basis shift to be positive */);
+    (0, internal_1.assert)(basisShift > 0, 0x812 /* Expected basis shift to be positive */);
     if (effect.endpoint !== undefined) {
-        adjusted.endpoint = {
-            ...effect.endpoint,
-            localId: (0, index_js_2.brand)(effect.endpoint.localId + basisShift),
-        };
+        adjusted.endpoint = adjustChangeAtomId(effect.endpoint, basisShift);
+    }
+    if (effect.truncatedEndpoint !== undefined) {
+        adjusted.truncatedEndpoint = adjustChangeAtomId(effect.truncatedEndpoint, basisShift);
+    }
+    if (effect.truncatedEndpointForInner !== undefined) {
+        adjusted.truncatedEndpointForInner = adjustChangeAtomId(effect.truncatedEndpointForInner, basisShift);
     }
     if (effect.movedEffect !== undefined) {
         const [_mark1, mark2] = (0, utils_js_1.splitMarkEffect)(effect.movedEffect, basisShift);
@@ -86,12 +89,18 @@ function getCrossFieldTargetFromMove(mark) {
     const type = mark.type;
     switch (type) {
         case "MoveIn":
-            return index_js_1.CrossFieldTarget.Destination;
+            return index_js_2.CrossFieldTarget.Destination;
         case "MoveOut":
-            return index_js_1.CrossFieldTarget.Source;
+            return index_js_2.CrossFieldTarget.Source;
         default:
-            (0, core_utils_1.unreachableCase)(type);
+            (0, internal_1.unreachableCase)(type);
     }
 }
 exports.getCrossFieldTargetFromMove = getCrossFieldTargetFromMove;
+function adjustChangeAtomId(id, shift) {
+    return {
+        ...id,
+        localId: (0, index_js_1.brand)(id.localId + shift),
+    };
+}
 //# sourceMappingURL=moveEffectTable.js.map

package/dist/feature-libraries/sequence-field/moveEffectTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"moveEffectTable.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/moveEffectTable.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\";\nimport { ChangeAtomId, RevisionTag, TaggedChange } from \"../../core/index.js\";\nimport { CrossFieldManager, CrossFieldTarget } from \"../modular-schema/index.js\";\nimport { RangeQueryResult, brand } from \"../../util/index.js\";\nimport { CellMark, Mark, MarkEffect, MoveId, MoveIn, MoveOut } from \"./types.js\";\nimport { isAttachAndDetachEffect, splitMark, splitMarkEffect } from \"./utils.js\";\nimport { MoveMarkEffect } from \"./helperTypes.js\";\n\nexport type MoveEffectTable<T> = CrossFieldManager<MoveEffect<T>>;\n\n/**\n * Changes to be applied to a move mark.\n */\nexport interface MoveEffect<T> {\n\t/**\n\t * Node changes which should be applied to this mark.\n\t * If this mark already has node changes, `modifyAfter` should be composed as later changes.\n\t */\n\tmodifyAfter?: T;\n\n\t/**\n\t * Only used during rebasing.\n\t * An effect from changeset being rebased which should be moved to the same position as this mark.\n\t */\n\tmovedEffect?: MarkEffect;\n\n\t/**\n\t * Rebased changes for a node which has been moved to the position of this mark.\n\t */\n\trebasedChanges?: T;\n\n\t/**\n\t * The ID of the new endpoint associated with this mark.\n\t */\n\tendpoint?: ChangeAtomId;\n}\n\ninterface MoveEffectWithBasis<T> extends MoveEffect<T> {\n\t/**\n\t * The ID for the start of the range this MoveEffect was created for.\n\t * This is used, for example, to correctly interpret `MoveEffect.endpoint` field.\n\t */\n\tbasis: MoveId;\n}\n\nexport enum MoveEnd {\n\tSource,\n\tDest,\n}\n\nexport interface MovePartition<TNodeChange> {\n\tid: MoveId;\n\n\t// Undefined means the partition is the same size as the input.\n\tcount?: number;\n\treplaceWith?: Mark<TNodeChange>[];\n\tmodifyAfter?: TaggedChange<TNodeChange>;\n}\n\nexport function setMoveEffect<T>(\n\tmoveEffects: MoveEffectTable<T>,\n\ttarget: CrossFieldTarget,\n\trevision: RevisionTag | undefined,\n\tid: MoveId,\n\tcount: number,\n\teffect: MoveEffect<T>,\n\tinvalidate: boolean = true,\n) {\n\t(effect as MoveEffectWithBasis<T>).basis = id;\n\tmoveEffects.set(target, revision, id, count, effect, invalidate);\n}\n\nexport function getMoveEffect<T>(\n\tmoveEffects: MoveEffectTable<T>,\n\ttarget: CrossFieldTarget,\n\trevision: RevisionTag | undefined,\n\tid: MoveId,\n\tcount: number,\n\taddDependency: boolean = true,\n): RangeQueryResult<MoveEffect<T>> {\n\tconst result = moveEffects.get(target, revision, id, count, addDependency);\n\treturn result.value !== undefined\n\t\t? { ...result, value: adjustMoveEffectBasis(result.value as MoveEffectWithBasis<T>, id) }\n\t\t: result;\n}\n\nexport type MoveMark<T> = CellMark<MoveMarkEffect, T>;\n\nexport function isMoveMark(effect: MarkEffect): effect is MoveMarkEffect {\n\treturn isMoveOut(effect) || isMoveIn(effect);\n}\n\nexport function isMoveOut(effect: MarkEffect): effect is MoveOut {\n\treturn effect.type === \"MoveOut\";\n}\n\nexport function isMoveIn(effect: MarkEffect): effect is MoveIn {\n\treturn effect.type === \"MoveIn\";\n}\n\nexport function getMoveIn(effect: MarkEffect): MoveIn | undefined {\n\tswitch (effect.type) {\n\t\tcase \"MoveIn\":\n\t\t\treturn effect;\n\t\tcase \"AttachAndDetach\":\n\t\t\treturn getMoveIn(effect.attach);\n\t\tdefault:\n\t\t\treturn undefined;\n\t}\n}\n\nfunction adjustMoveEffectBasis<T>(effect: MoveEffectWithBasis<T>, newBasis: MoveId): MoveEffect<T> {\n\tif (effect.basis === newBasis) {\n\t\treturn effect;\n\t}\n\n\tconst adjusted = { ...effect, basis: newBasis };\n\tconst basisShift = newBasis - effect.basis;\n\tassert(basisShift > 0, 0x812 /* Expected basis shift to be positive */);\n\n\tif (effect.endpoint !== undefined) {\n\t\tadjusted.endpoint = {\n\t\t\t...effect.endpoint,\n\t\t\tlocalId: brand(effect.endpoint.localId + basisShift),\n\t\t};\n\t}\n\n\tif (effect.movedEffect !== undefined) {\n\t\tconst [_mark1, mark2] = splitMarkEffect(effect.movedEffect, basisShift);\n\t\tadjusted.movedEffect = mark2;\n\t}\n\n\treturn adjusted;\n}\n\nexport function splitMarkForMoveEffects<T>(\n\tmark: Mark<T>,\n\trevision: RevisionTag | undefined,\n\teffects: MoveEffectTable<T>,\n): Mark<T>[] {\n\tconst length = getFirstMoveEffectLength(mark, mark.count, revision, effects);\n\treturn length < mark.count ? splitMark(mark, length) : [mark];\n}\n\nfunction getFirstMoveEffectLength(\n\tmarkEffect: MarkEffect,\n\tcount: number,\n\trevision: RevisionTag | undefined,\n\teffects: MoveEffectTable<unknown>,\n): number {\n\tif (isMoveMark(markEffect)) {\n\t\treturn getMoveEffect(\n\t\t\teffects,\n\t\t\tgetCrossFieldTargetFromMove(markEffect),\n\t\t\tmarkEffect.revision ?? revision,\n\t\t\tmarkEffect.id,\n\t\t\tcount,\n\t\t).length;\n\t} else if (isAttachAndDetachEffect(markEffect)) {\n\t\treturn Math.min(\n\t\t\tgetFirstMoveEffectLength(markEffect.attach, count, revision, effects),\n\t\t\tgetFirstMoveEffectLength(markEffect.detach, count, revision, effects),\n\t\t);\n\t}\n\n\treturn count;\n}\n\nexport function getCrossFieldTargetFromMove(mark: MoveMarkEffect): CrossFieldTarget {\n\tconst type = mark.type;\n\tswitch (type) {\n\t\tcase \"MoveIn\":\n\t\t\treturn CrossFieldTarget.Destination;\n\t\tcase \"MoveOut\":\n\t\t\treturn CrossFieldTarget.Source;\n\t\tdefault:\n\t\t\tunreachableCase(type);\n\t}\n}\n"]}
+{"version":3,"file":"moveEffectTable.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/moveEffectTable.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 { ChangeAtomId, RevisionTag, TaggedChange } from \"../../core/index.js\";\nimport { RangeQueryResult, brand } from \"../../util/index.js\";\nimport { CrossFieldManager, CrossFieldTarget, NodeId } from \"../modular-schema/index.js\";\n\nimport { MoveMarkEffect } from \"./helperTypes.js\";\nimport { CellMark, Mark, MarkEffect, MoveId, MoveIn, MoveOut } from \"./types.js\";\nimport { isAttachAndDetachEffect, splitMark, splitMarkEffect } from \"./utils.js\";\n\nexport type MoveEffectTable = CrossFieldManager<MoveEffect>;\n\n/**\n * Changes to be applied to a move mark.\n */\nexport interface MoveEffect {\n\t/**\n\t * Node changes which should be applied to this mark.\n\t * If this mark already has node changes, `modifyAfter` should be composed as later changes.\n\t */\n\tmodifyAfter?: NodeId;\n\n\t/**\n\t * Only used during rebasing.\n\t * An effect from changeset being rebased which should be moved to the same position as this mark.\n\t */\n\tmovedEffect?: MarkEffect;\n\n\t/**\n\t * Rebased changes for a node which has been moved to the position of this mark.\n\t */\n\trebasedChanges?: NodeId;\n\n\t/**\n\t * The ID of the other outer endpoint.\n\t * Used when this is the outer endpoint in a move chain which is being composed with another move chain.\n\t */\n\tendpoint?: ChangeAtomId;\n\n\t/**\n\t * The ID of the truncated endpoint.\n\t * Used when this mark is the outer endpoint of a chain being composed with a redundant move chain.\n\t */\n\ttruncatedEndpoint?: ChangeAtomId;\n\n\t/**\n\t * The ID of the truncated endpoint.\n\t * Used when this mark is the inner endpoint of a redundant move chain.\n\t */\n\ttruncatedEndpointForInner?: ChangeAtomId;\n}\n\ninterface MoveEffectWithBasis extends MoveEffect {\n\t/**\n\t * The ID for the start of the range this MoveEffect was created for.\n\t * This is used, for example, to correctly interpret `MoveEffect.endpoint` field.\n\t */\n\tbasis: MoveId;\n}\n\nexport enum MoveEnd {\n\tSource,\n\tDest,\n}\n\nexport interface MovePartition {\n\tid: MoveId;\n\n\t// Undefined means the partition is the same size as the input.\n\tcount?: number;\n\treplaceWith?: Mark[];\n\tmodifyAfter?: TaggedChange<NodeId>;\n}\n\nexport function setMoveEffect(\n\tmoveEffects: MoveEffectTable,\n\ttarget: CrossFieldTarget,\n\trevision: RevisionTag | undefined,\n\tid: MoveId,\n\tcount: number,\n\teffect: MoveEffect,\n\tinvalidate: boolean = true,\n) {\n\t(effect as MoveEffectWithBasis).basis = id;\n\tmoveEffects.set(target, revision, id, count, effect, invalidate);\n}\n\nexport function getMoveEffect(\n\tmoveEffects: MoveEffectTable,\n\ttarget: CrossFieldTarget,\n\trevision: RevisionTag | undefined,\n\tid: MoveId,\n\tcount: number,\n\taddDependency: boolean = true,\n): RangeQueryResult<MoveEffect> {\n\tconst result = moveEffects.get(target, revision, id, count, addDependency);\n\treturn result.value !== undefined\n\t\t? { ...result, value: adjustMoveEffectBasis(result.value as MoveEffectWithBasis, id) }\n\t\t: result;\n}\n\nexport type MoveMark = CellMark<MoveMarkEffect>;\n\nexport function isMoveMark(effect: MarkEffect): effect is MoveMarkEffect {\n\treturn isMoveOut(effect) || isMoveIn(effect);\n}\n\nexport function isMoveOut(effect: MarkEffect): effect is MoveOut {\n\treturn effect.type === \"MoveOut\";\n}\n\nexport function isMoveIn(effect: MarkEffect): effect is MoveIn {\n\treturn effect.type === \"MoveIn\";\n}\n\nexport function getMoveIn(effect: MarkEffect): MoveIn | undefined {\n\tswitch (effect.type) {\n\t\tcase \"MoveIn\":\n\t\t\treturn effect;\n\t\tcase \"AttachAndDetach\":\n\t\t\treturn getMoveIn(effect.attach);\n\t\tdefault:\n\t\t\treturn undefined;\n\t}\n}\n\nfunction adjustMoveEffectBasis(effect: MoveEffectWithBasis, newBasis: MoveId): MoveEffect {\n\tif (effect.basis === newBasis) {\n\t\treturn effect;\n\t}\n\n\tconst adjusted = { ...effect, basis: newBasis };\n\tconst basisShift = newBasis - effect.basis;\n\tassert(basisShift > 0, 0x812 /* Expected basis shift to be positive */);\n\n\tif (effect.endpoint !== undefined) {\n\t\tadjusted.endpoint = adjustChangeAtomId(effect.endpoint, basisShift);\n\t}\n\n\tif (effect.truncatedEndpoint !== undefined) {\n\t\tadjusted.truncatedEndpoint = adjustChangeAtomId(effect.truncatedEndpoint, basisShift);\n\t}\n\n\tif (effect.truncatedEndpointForInner !== undefined) {\n\t\tadjusted.truncatedEndpointForInner = adjustChangeAtomId(\n\t\t\teffect.truncatedEndpointForInner,\n\t\t\tbasisShift,\n\t\t);\n\t}\n\n\tif (effect.movedEffect !== undefined) {\n\t\tconst [_mark1, mark2] = splitMarkEffect(effect.movedEffect, basisShift);\n\t\tadjusted.movedEffect = mark2;\n\t}\n\n\treturn adjusted;\n}\n\nexport function splitMarkForMoveEffects(\n\tmark: Mark,\n\trevision: RevisionTag | undefined,\n\teffects: MoveEffectTable,\n): Mark[] {\n\tconst length = getFirstMoveEffectLength(mark, mark.count, revision, effects);\n\treturn length < mark.count ? splitMark(mark, length) : [mark];\n}\n\nfunction getFirstMoveEffectLength(\n\tmarkEffect: MarkEffect,\n\tcount: number,\n\trevision: RevisionTag | undefined,\n\teffects: MoveEffectTable,\n): number {\n\tif (isMoveMark(markEffect)) {\n\t\treturn getMoveEffect(\n\t\t\teffects,\n\t\t\tgetCrossFieldTargetFromMove(markEffect),\n\t\t\tmarkEffect.revision ?? revision,\n\t\t\tmarkEffect.id,\n\t\t\tcount,\n\t\t).length;\n\t} else if (isAttachAndDetachEffect(markEffect)) {\n\t\treturn Math.min(\n\t\t\tgetFirstMoveEffectLength(markEffect.attach, count, revision, effects),\n\t\t\tgetFirstMoveEffectLength(markEffect.detach, count, revision, effects),\n\t\t);\n\t}\n\n\treturn count;\n}\n\nexport function getCrossFieldTargetFromMove(mark: MoveMarkEffect): CrossFieldTarget {\n\tconst type = mark.type;\n\tswitch (type) {\n\t\tcase \"MoveIn\":\n\t\t\treturn CrossFieldTarget.Destination;\n\t\tcase \"MoveOut\":\n\t\t\treturn CrossFieldTarget.Source;\n\t\tdefault:\n\t\t\tunreachableCase(type);\n\t}\n}\n\nfunction adjustChangeAtomId(id: ChangeAtomId, shift: number): ChangeAtomId {\n\treturn {\n\t\t...id,\n\t\tlocalId: brand(id.localId + shift),\n\t};\n}\n"]}

package/dist/feature-libraries/sequence-field/prune.d.ts

@@ -2,7 +2,7 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
+import { NodeChangePruner } from "../modular-schema/index.js";
 import { Changeset } from "./types.js";
-export type NodeChangePruner<TNodeChange> = (change: TNodeChange) => TNodeChange | undefined;
-export declare function prune<TNodeChange>(changeset: Changeset<TNodeChange>, pruneNode: NodeChangePruner<TNodeChange>): Changeset<TNodeChange>;
+export declare function prune(changeset: Changeset, pruneNode: NodeChangePruner): Changeset;
 //# sourceMappingURL=prune.d.ts.map

package/dist/feature-libraries/sequence-field/prune.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prune.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/prune.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,MAAM,MAAM,gBAAgB,CAAC,WAAW,IAAI,CAAC,MAAM,EAAE,WAAW,KAAK,WAAW,GAAG,SAAS,CAAC;AAE7F,wBAAgB,KAAK,CAAC,WAAW,EAChC,SAAS,EAAE,SAAS,CAAC,WAAW,CAAC,EACjC,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC,GACtC,SAAS,CAAC,WAAW,CAAC,CASxB"}
+{"version":3,"file":"prune.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/prune.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,wBAAgB,KAAK,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,gBAAgB,GAAG,SAAS,CASlF"}

package/dist/feature-libraries/sequence-field/prune.js.map

@@ -1 +1 @@
-{"version":3,"file":"prune.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/prune.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAGH,6DAAuD;AACvD,yCAA4C;AAI5C,SAAgB,KAAK,CACpB,SAAiC,EACjC,SAAwC;IAExC,MAAM,MAAM,GAAG,IAAI,oCAAe,EAAe,CAAC;IAClD,KAAK,IAAI,IAAI,IAAI,SAAS,EAAE;QAC3B,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;YAC/B,IAAI,GAAG,IAAA,yBAAc,EAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;SACrD;QACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KAClB;IACD,OAAO,MAAM,CAAC,IAAI,CAAC;AACpB,CAAC;AAZD,sBAYC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { Changeset } from \"./types.js\";\nimport { MarkListFactory } from \"./markListFactory.js\";\nimport { withNodeChange } from \"./utils.js\";\n\nexport type NodeChangePruner<TNodeChange> = (change: TNodeChange) => TNodeChange | undefined;\n\nexport function prune<TNodeChange>(\n\tchangeset: Changeset<TNodeChange>,\n\tpruneNode: NodeChangePruner<TNodeChange>,\n): Changeset<TNodeChange> {\n\tconst pruned = new MarkListFactory<TNodeChange>();\n\tfor (let mark of changeset) {\n\t\tif (mark.changes !== undefined) {\n\t\t\tmark = withNodeChange(mark, pruneNode(mark.changes));\n\t\t}\n\t\tpruned.push(mark);\n\t}\n\treturn pruned.list;\n}\n"]}
+{"version":3,"file":"prune.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/prune.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAGH,6DAAuD;AAEvD,yCAA4C;AAE5C,SAAgB,KAAK,CAAC,SAAoB,EAAE,SAA2B;IACtE,MAAM,MAAM,GAAG,IAAI,oCAAe,EAAE,CAAC;IACrC,KAAK,IAAI,IAAI,IAAI,SAAS,EAAE;QAC3B,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;YAC/B,IAAI,GAAG,IAAA,yBAAc,EAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;SACrD;QACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KAClB;IACD,OAAO,MAAM,CAAC,IAAI,CAAC;AACpB,CAAC;AATD,sBASC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { NodeChangePruner } from \"../modular-schema/index.js\";\nimport { MarkListFactory } from \"./markListFactory.js\";\nimport { Changeset } from \"./types.js\";\nimport { withNodeChange } from \"./utils.js\";\n\nexport function prune(changeset: Changeset, pruneNode: NodeChangePruner): Changeset {\n\tconst pruned = new MarkListFactory();\n\tfor (let mark of changeset) {\n\t\tif (mark.changes !== undefined) {\n\t\t\tmark = withNodeChange(mark, pruneNode(mark.changes));\n\t\t}\n\t\tpruned.push(mark);\n\t}\n\treturn pruned.list;\n}\n"]}

package/dist/feature-libraries/sequence-field/rebase.d.ts

@@ -2,9 +2,9 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { IdAllocator } from "../../util/index.js";
 import { TaggedChange } from "../../core/index.js";
-import { CrossFieldManager, NodeExistenceState, RebaseRevisionMetadata } from "../modular-schema/index.js";
+import { IdAllocator } from "../../util/index.js";
+import { CrossFieldManager, NodeChangeRebaser, NodeExistenceState, RebaseRevisionMetadata } from "../modular-schema/index.js";
 import { Changeset, MarkEffect } from "./types.js";
 /**
  * Rebases `change` over `base` assuming they both apply to the same initial state.
@@ -12,7 +12,6 @@ import { Changeset, MarkEffect } from "./types.js";
  * @param base - The changeset to rebase over.
  * @returns A changeset that performs the changes in `change` but does so assuming `base` has been applied first.
  */
-export declare function rebase<TNodeChange>(change: Changeset<TNodeChange>, base: TaggedChange<Changeset<TNodeChange>>, rebaseChild: NodeChangeRebaser<TNodeChange>, genId: IdAllocator, manager: CrossFieldManager, revisionMetadata: RebaseRevisionMetadata, nodeExistenceState?: NodeExistenceState): Changeset<TNodeChange>;
-export type NodeChangeRebaser<TNodeChange> = (change: TNodeChange | undefined, baseChange: TNodeChange | undefined, stateChange?: NodeExistenceState) => TNodeChange | undefined;
+export declare function rebase(change: Changeset, base: TaggedChange<Changeset>, rebaseChild: NodeChangeRebaser, genId: IdAllocator, manager: CrossFieldManager, revisionMetadata: RebaseRevisionMetadata, nodeExistenceState?: NodeExistenceState): Changeset;
 export declare function isRedetach(effect: MarkEffect): boolean;
 //# sourceMappingURL=rebase.d.ts.map

package/dist/feature-libraries/sequence-field/rebase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rebase.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/rebase.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,WAAW,EAAmC,MAAM,qBAAqB,CAAC;AACnF,OAAO,EAKN,YAAY,EACZ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACN,iBAAiB,EAEjB,kBAAkB,EAClB,sBAAsB,EAEtB,MAAM,4BAA4B,CAAC;AA4BpC,OAAO,EACN,SAAS,EAUT,UAAU,EAIV,MAAM,YAAY,CAAC;AAgBpB;;;;;GAKG;AACH,wBAAgB,MAAM,CAAC,WAAW,EACjC,MAAM,EAAE,SAAS,CAAC,WAAW,CAAC,EAC9B,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,EAC1C,WAAW,EAAE,iBAAiB,CAAC,WAAW,CAAC,EAC3C,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,iBAAiB,EAC1B,gBAAgB,EAAE,sBAAsB,EACxC,kBAAkB,GAAE,kBAA6C,GAC/D,SAAS,CAAC,WAAW,CAAC,CAWxB;AAED,MAAM,MAAM,iBAAiB,CAAC,WAAW,IAAI,CAC5C,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,UAAU,EAAE,WAAW,GAAG,SAAS,EACnC,WAAW,CAAC,EAAE,kBAAkB,KAC5B,WAAW,GAAG,SAAS,CAAC;AAkH7B,wBAAgB,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAUtD"}
+{"version":3,"file":"rebase.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/rebase.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAKN,YAAY,EACZ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAmC,MAAM,qBAAqB,CAAC;AACnF,OAAO,EACN,iBAAiB,EAEjB,iBAAiB,EACjB,kBAAkB,EAElB,sBAAsB,EAEtB,MAAM,4BAA4B,CAAC;AAgBpC,OAAO,EAGN,SAAS,EAKT,UAAU,EAOV,MAAM,YAAY,CAAC;AA6BpB;;;;;GAKG;AACH,wBAAgB,MAAM,CACrB,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC,EAC7B,WAAW,EAAE,iBAAiB,EAC9B,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,iBAAiB,EAC1B,gBAAgB,EAAE,sBAAsB,EACxC,kBAAkB,GAAE,kBAA6C,GAC/D,SAAS,CAWX;AAkHD,wBAAgB,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAUtD"}

package/dist/feature-libraries/sequence-field/rebase.js

@@ -5,16 +5,16 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isRedetach = exports.rebase = void 0;
-const core_utils_1 = require("@fluidframework/core-utils");
+const internal_1 = require("@fluidframework/core-utils/internal");
 const index_js_1 = require("../../util/index.js");
 const index_js_2 = require("../modular-schema/index.js");
-const utils_js_1 = require("./utils.js");
-const types_js_1 = require("./types.js");
-const markListFactory_js_1 = require("./markListFactory.js");
-const moveEffectTable_js_1 = require("./moveEffectTable.js");
-const markQueue_js_1 = require("./markQueue.js");
 const config_js_1 = require("./config.js");
 const format_js_1 = require("./format.js");
+const markListFactory_js_1 = require("./markListFactory.js");
+const markQueue_js_1 = require("./markQueue.js");
+const moveEffectTable_js_1 = require("./moveEffectTable.js");
+const types_js_1 = require("./types.js");
+const utils_js_1 = require("./utils.js");
 /**
  * Rebases `change` over `base` assuming they both apply to the same initial state.
  * @param change - The changeset to rebase.
@@ -43,15 +43,15 @@ function rebaseMarkList(currMarkList, baseMarkList, baseRevision, metadata, reba
                 // Note that we want the revision in the detach ID to be the actual revision, not the intention.
                 // TODO: re-examine why this case needs the two kinds of overrides to be treated differently.
                 const detachId = (0, utils_js_1.getDetachIdForLineage)(baseMark, baseRevision);
-                (0, core_utils_1.assert)(detachId !== undefined, 0x816 /* Mark which empties cells should have a detach ID */);
-                (0, core_utils_1.assert)(detachId.revision !== undefined, 0x74a /* Detach ID should have a revision */);
+                (0, internal_1.assert)(detachId !== undefined, 0x816 /* Mark which empties cells should have a detach ID */);
+                (0, internal_1.assert)(detachId.revision !== undefined, 0x74a /* Detach ID should have a revision */);
                 const detachBlock = (0, index_js_1.getOrAddEmptyToMap)(detachBlocks, detachId.revision);
                 addIdRange(detachBlock, {
                     id: detachId.localId,
                     count: baseMark.count,
                 });
                 addLineageToRecipients(rebasedCellBlocks, detachId.revision, detachId.localId, baseMark.count, metadata);
-                (0, core_utils_1.assert)((0, utils_js_1.areInputCellsEmpty)(rebasedMark) && rebasedMark.cellId.revision !== undefined, 0x817 /* Mark should have empty input cells after rebasing over a cell-emptying mark */);
+                (0, internal_1.assert)((0, utils_js_1.areInputCellsEmpty)(rebasedMark) && rebasedMark.cellId.revision !== undefined, 0x817 /* Mark should have empty input cells after rebasing over a cell-emptying mark */);
                 // A re-detach sports a cell ID with the adjacent cells from the original detach.
                 // Marks that are rebased over such a re-detach will adopt this cell ID as-is and do not need to have the
                 // adjacent cells be updated. Moreover, the base changeset may not have all the detaches from the original
@@ -123,7 +123,7 @@ class RebaseQueue {
     pop() {
         const baseMark = this.baseMarks.peek();
         const newMark = this.newMarks.peek();
-        (0, core_utils_1.assert)(!(baseMark === undefined && newMark === undefined), 0x722 /* Cannot pop from empty queue */);
+        (0, internal_1.assert)(!(baseMark === undefined && newMark === undefined), 0x722 /* Cannot pop from empty queue */);
         if (baseMark === undefined) {
             const dequeuedNewMark = this.newMarks.dequeue();
             return {
@@ -139,7 +139,7 @@ class RebaseQueue {
                 case config_js_1.CellOrderingMethod.Tombstone: {
                     const baseId = (0, utils_js_1.getInputCellId)(baseMark, this.baseMarks.revision, this.metadata);
                     const newId = (0, utils_js_1.getInputCellId)(newMark, undefined, this.metadata);
-                    (0, core_utils_1.assert)(baseId !== undefined && newId !== undefined, 0x89f /* Both marks should have cell IDs */);
+                    (0, internal_1.assert)(baseId !== undefined && newId !== undefined, 0x89f /* Both marks should have cell IDs */);
                     const comparison = (0, utils_js_1.compareCellPositionsUsingTombstones)(baseId, newId, this.baseMarksCellSources, this.newMarksCellSources, this.metadata);
                     switch (comparison) {
                         case utils_js_1.CellOrder.SameCell:
@@ -149,7 +149,7 @@ class RebaseQueue {
                         case utils_js_1.CellOrder.NewThenOld:
                             return this.dequeueNew();
                         default:
-                            (0, core_utils_1.unreachableCase)(comparison);
+                            (0, internal_1.unreachableCase)(comparison);
                     }
                 }
                 case config_js_1.CellOrderingMethod.Lineage: {
@@ -169,7 +169,7 @@ class RebaseQueue {
                     }
                 }
                 default:
-                    (0, core_utils_1.unreachableCase)(config_js_1.sequenceConfig.cellOrdering);
+                    (0, internal_1.unreachableCase)(config_js_1.sequenceConfig.cellOrdering);
             }
         }
         else if ((0, utils_js_1.areInputCellsEmpty)(newMark)) {
@@ -201,7 +201,7 @@ class RebaseQueue {
     dequeueBoth() {
         const baseMark = this.baseMarks.peek();
         const newMark = this.newMarks.peek();
-        (0, core_utils_1.assert)(baseMark !== undefined && newMark !== undefined, 0x69c /* Cannot dequeue both unless both mark queues are non-empty */);
+        (0, internal_1.assert)(baseMark !== undefined && newMark !== undefined, 0x69c /* Cannot dequeue both unless both mark queues are non-empty */);
         const length = Math.min(newMark.count, baseMark.count);
         const sizedBaseMark = this.baseMarks.dequeueUpTo(length);
         const sizedNewMark = this.newMarks.dequeueUpTo(length);
@@ -222,27 +222,21 @@ class RebaseQueue {
  */
 function addMovedMarkEffect(mark, effect) {
     if ((0, moveEffectTable_js_1.isMoveIn)(mark) && (0, moveEffectTable_js_1.isMoveOut)(effect)) {
-        const result = {
-            ...mark,
-            type: "Insert",
-            count: mark.count,
-            id: mark.id,
-        };
-        if (effect.revision !== undefined) {
-            result.revision = effect.revision;
-        }
-        return result;
+        return { ...mark, type: "Insert" };
+    }
+    else if ((0, utils_js_1.isAttachAndDetachEffect)(mark) && (0, moveEffectTable_js_1.isMoveIn)(mark.attach) && (0, moveEffectTable_js_1.isMoveOut)(effect)) {
+        return { ...mark.detach, count: mark.count };
     }
     else if ((0, utils_js_1.isTombstone)(mark)) {
         return { ...mark, ...effect };
     }
-    (0, core_utils_1.assert)(false, 0x818 /* Unexpected combination of mark effects at source and destination */);
+    (0, internal_1.assert)(false, 0x818 /* Unexpected combination of mark effects at source and destination */);
 }
 function rebaseMark(currMark, baseMark, baseRevision, metadata, rebaseChild, moveEffects, nodeExistenceState) {
     const rebasedMark = rebaseNodeChange((0, utils_js_1.cloneMark)(currMark), baseMark, rebaseChild);
     const movedNodeChanges = getMovedChangesFromBaseMark(moveEffects, baseMark, baseRevision);
     if (movedNodeChanges !== undefined) {
-        (0, core_utils_1.assert)(rebasedMark.changes === undefined, 0x8dc /* Unexpected collision of new node changes */);
+        (0, internal_1.assert)(rebasedMark.changes === undefined, 0x8dc /* Unexpected collision of new node changes */);
         rebasedMark.changes = movedNodeChanges;
     }
     return rebaseMarkIgnoreChild(rebasedMark, baseMark, baseRevision, metadata, moveEffects, nodeExistenceState);
@@ -254,11 +248,11 @@ function rebaseMarkIgnoreChild(currMark, baseMark, baseRevision, metadata, moveE
             // Detaches on empty cells have an implicit revive effect.
             delete currMark.cellId;
         }
-        (0, core_utils_1.assert)(!(0, utils_js_1.isNewAttach)(currMark), 0x69d /* A new attach should not be rebased over its cell being emptied */);
-        const baseCellId = (0, utils_js_1.getDetachOutputId)(baseMark, baseRevision, metadata);
+        (0, internal_1.assert)(!(0, utils_js_1.isNewAttach)(currMark), 0x69d /* A new attach should not be rebased over its cell being emptied */);
+        const baseCellId = (0, utils_js_1.getDetachOutputCellId)(baseMark, baseRevision, metadata);
         if ((0, moveEffectTable_js_1.isMoveOut)(baseMark)) {
-            (0, core_utils_1.assert)((0, moveEffectTable_js_1.isMoveMark)(baseMark), 0x6f0 /* Only move marks have move IDs */);
-            (0, core_utils_1.assert)(!(0, utils_js_1.isNewAttach)(currMark), 0x819 /* New attaches should not be rebased over moves */);
+            (0, internal_1.assert)((0, moveEffectTable_js_1.isMoveMark)(baseMark), 0x6f0 /* Only move marks have move IDs */);
+            (0, internal_1.assert)(!(0, utils_js_1.isNewAttach)(currMark), 0x819 /* New attaches should not be rebased over moves */);
             const { remains, follows } = separateEffectsForMove((0, utils_js_1.extractMarkEffect)(currMark));
             if (follows !== undefined) {
                 sendEffectToDest(follows, moveEffects, (0, utils_js_1.getEndpoint)(baseMark, baseRevision), baseMark.count);
@@ -279,7 +273,7 @@ function rebaseMarkIgnoreChild(currMark, baseMark, baseRevision, metadata, moveE
             : withCellId(currMark, undefined);
     }
     else if ((0, utils_js_1.isAttachAndDetachEffect)(baseMark)) {
-        (0, core_utils_1.assert)(baseMark.cellId !== undefined, 0x81a /* AttachAndDetach mark should target an empty cell */);
+        (0, internal_1.assert)(baseMark.cellId !== undefined, 0x81a /* AttachAndDetach mark should target an empty cell */);
         const halfRebasedMark = rebaseMarkIgnoreChild(currMark, { ...baseMark.attach, cellId: (0, utils_js_1.cloneCellId)(baseMark.cellId), count: baseMark.count }, baseRevision, metadata, moveEffects, nodeExistenceState);
         rebasedMark = rebaseMarkIgnoreChild(halfRebasedMark, { ...baseMark.detach, count: baseMark.count }, baseRevision, metadata, moveEffects, nodeExistenceState);
     }
@@ -320,7 +314,7 @@ function separateEffectsForMove(mark) {
             return { remains, follows };
         }
         default:
-            (0, core_utils_1.unreachableCase)(type);
+            (0, internal_1.unreachableCase)(type);
     }
 }
 // TODO: Reduce the duplication between this and other MoveEffect helpers
@@ -363,7 +357,7 @@ function rebaseNodeChange(currMark, baseMark, nodeRebaser) {
     return (0, utils_js_1.withNodeChange)(currMark, nodeRebaser(currChange, baseChange));
 }
 function makeDetachedMark(mark, cellId) {
-    (0, core_utils_1.assert)(mark.cellId === undefined, 0x69f /* Expected mark to be attached */);
+    (0, internal_1.assert)(mark.cellId === undefined, 0x69f /* Expected mark to be attached */);
     return { ...mark, cellId };
 }
 function withCellId(mark, cellId) {
@@ -390,7 +384,7 @@ function getMovedEffectFromBaseMark(moveEffects, baseMark, baseRevision) {
 // TODO: Reduce the duplication between this and other MoveEffect helpers
 function getMovedEffect(moveEffects, revision, id, count) {
     const effect = (0, moveEffectTable_js_1.getMoveEffect)(moveEffects, index_js_2.CrossFieldTarget.Destination, revision, id, count);
-    (0, core_utils_1.assert)(effect.length === count, 0x6f3 /* Expected effect to cover entire mark */);
+    (0, internal_1.assert)(effect.length === count, 0x6f3 /* Expected effect to cover entire mark */);
     return effect.value?.movedEffect;
 }
 function getMovedChangesFromBaseMark(moveEffects, baseMark, baseRevision) {
@@ -453,7 +447,7 @@ function getAttachRevisionIndex(metadata, baseMark, baseRevision) {
         return -Infinity;
     }
     if ((0, utils_js_1.markFillsCells)(baseMark)) {
-        (0, core_utils_1.assert)((0, utils_js_1.isAttach)(baseMark), 0x81b /* Only attach marks can fill cells */);
+        (0, internal_1.assert)((0, utils_js_1.isAttach)(baseMark), 0x81b /* Only attach marks can fill cells */);
         return getRevisionIndex(metadata, baseMark.revision ?? baseRevision ?? (0, index_js_1.fail)("Mark must have revision"));
     }
     if ((0, utils_js_1.isAttachAndDetachEffect)(baseMark)) {
@@ -466,7 +460,7 @@ function getDetachRevisionIndex(metadata, baseMark, baseRevision) {
         return Infinity;
     }
     if ((0, utils_js_1.markEmptiesCells)(baseMark)) {
-        (0, core_utils_1.assert)((0, utils_js_1.isDetach)(baseMark), 0x81c /* Only detach marks can empty cells */);
+        (0, internal_1.assert)((0, utils_js_1.isDetach)(baseMark), 0x81c /* Only detach marks can empty cells */);
         return getRevisionIndex(metadata, baseMark.revision ?? baseRevision ?? (0, index_js_1.fail)("Mark must have revision"));
     }
     if ((0, utils_js_1.isAttachAndDetachEffect)(baseMark)) {
@@ -541,8 +535,8 @@ function addIdRange(lineageEntries, range) {
     lineageEntries.push(range);
 }
 function setMarkAdjacentCells(mark, adjacentCells) {
-    (0, core_utils_1.assert)(mark.cellId !== undefined, 0x74d /* Can only set adjacent cells on a mark with cell ID */);
-    (0, core_utils_1.assert)(mark.cellId.adjacentCells === undefined, 0x74e /* Should not overwrite adjacentCells */);
+    (0, internal_1.assert)(mark.cellId !== undefined, 0x74d /* Can only set adjacent cells on a mark with cell ID */);
+    (0, internal_1.assert)(mark.cellId.adjacentCells === undefined, 0x74e /* Should not overwrite adjacentCells */);
     mark.cellId.adjacentCells = adjacentCells;
 }
 function shouldReceiveLineage(cellRevision, detachRevision, metadata) {
@@ -578,9 +572,9 @@ function shouldReceiveLineage(cellRevision, detachRevision, metadata) {
 function compareCellPositions(baseRevision, baseMark, newMark, metadata) {
     const baseId = (0, utils_js_1.getInputCellId)(baseMark, baseRevision, metadata);
     const baseLength = baseMark.count;
-    (0, core_utils_1.assert)(baseId?.revision !== undefined, 0x6a0 /* baseMark should have cell ID */);
+    (0, internal_1.assert)(baseId?.revision !== undefined, 0x6a0 /* baseMark should have cell ID */);
     const newId = (0, utils_js_1.getInputCellId)(newMark, undefined, metadata);
-    (0, core_utils_1.assert)(newId !== undefined, 0x85a /* newMark should have cell ID */);
+    (0, internal_1.assert)(newId !== undefined, 0x85a /* newMark should have cell ID */);
     const newLength = newMark.count;
     if (newId !== undefined && baseId.revision === newId.revision) {
         const cmp = (0, utils_js_1.compareCellsFromSameRevision)(baseId, baseMark.count, newId, newMark.count);