npm - @fluidframework/tree - Versions diffs - 2.118.1 → 3.0.1 - Mend

@fluidframework/tree 2.118.1 → 3.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1234) hide show

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

	@@ -1 +1 @@
1	- {"version":3,"file":"schemaSummarizer.js","sourceRoot":"","sources":["../../../src/feature-libraries/schema-index/schemaSummarizer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAC;AAE7D,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AASjE,OAAO,EAGN,iBAAiB,GACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACN,mBAAmB,GAInB,MAAM,iCAAiC,CAAC;AAGzC,MAAM,CAAC,MAAM,eAAe,GAAG,cAAc,CAAC;AAE9C;;GAEG;AACH,MAAM,CAAN,IAAkB,0BAajB;AAbD,WAAkB,0BAA0B;IAC3C;;OAEG;IACH,uEAAM,CAAA;IACN;;OAEG;IACH,uEAAM,CAAA;IACN;;OAEG;IACH,iFAAY,CAAA;AACb,CAAC,EAbiB,0BAA0B,KAA1B,0BAA0B,QAa3C;AAED,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAA6B;;;CAG7D,CAAC,CAAC;AAEH;;GAEG;AACH,SAAS,sCAAsC,CAC9C,OAAqC;IAErC,2EAA2E;IAC3E,6CAAqC;AACtC,CAAC;AAED;;GAEG;AACH,MAAM,OAAO,gBACZ,SAAQ,mBAA+C;~~IAKvD~~,YACkB,MAA+B,EAChD,YAA0B,EACT,KAAmC,EACpD,mBAAiD;QAEjD,KAAK,CACJ,QAAQ,EACR,sCAAsC,CAAC,mBAAmB,CAAC,EAC3D,iBAAiB,EACjB,IAAI,CAAC,gCAAgC,CACrC,CAAC;QAVe,WAAM,GAAN,MAAM,CAAyB;QAE/B,UAAK,GAAL,KAAK,CAA8B;QASpD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;YAC/C,gFAAgF;YAChF,uGAAuG;YACvG,IAAI,CAAC,yBAAyB,GAAG,YAAY,CAAC,aAAa,EAAE,CAAC;QAC/D,CAAC,CAAC,CAAC;IACJ,CAAC;IAES,iBAAiB,CAAC,KAO3B;QACA,MAAM,EAAE,OAAO,EAAE,yBAAyB,EAAE,SAAS,EAAE,QAAQ,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC;QAClF,IACC,CAAC,QAAQ;YACT,yBAAyB,KAAK,SAAS;YACvC,IAAI,CAAC,yBAAyB,KAAK,SAAS;YAC5C,yBAAyB,CAAC,2BAA2B,IAAI,IAAI,CAAC,yBAAyB,EACtF,CAAC;YACF,OAAO,CAAC,SAAS,CAChB,eAAe,EACf,WAAW,CAAC,IAAI,EAChB,GAAG,yBAAyB,CAAC,WAAW,IAAI,eAAe,EAAE,CAC7D,CAAC;QACH,CAAC;aAAM,CAAC;YACP,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAC7D,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;QAC9C,CAAC;IACF,CAAC;IAES,KAAK,CAAC,YAAY,CAC3B,QAAgC,EAChC,KAA2B;QAE3B,MAAM,YAAY,GAAoB,MAAM,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QAC/E,kEAAkE;QAClE,0EAA0E;QAC1E,iDAAiD;QACjD,MAAM,CACL,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,EAC9B,KAAK,CAAC,0EAA0E,CAChF,CAAC;QAEF,MAAM,YAAY,GAAG,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAC1D,+DAA+D;QAC/D,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,IAAI,CAAC,yBAAyB,GAAG,CAAC,CAAC;IACpC,CAAC;CACD","sourcesContent":["/!\n Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n /\n\nimport { bufferToString } from \"@fluid-internal/client-utils\";\nimport { assert } from \"@fluidframework/core-utils/internal\";\nimport type { IChannelStorageService } from \"@fluidframework/datastore-definitions/internal\";\nimport { SummaryType } from \"@fluidframework/driver-definitions\";\nimport type {\n\tIExperimentalIncrementalSummaryContext,\n\tITelemetryContext,\n\tOldestSupportedClientVersion,\n} from \"@fluidframework/runtime-definitions/internal\";\nimport type { SummaryTreeBuilder } from \"@fluidframework/runtime-utils/internal\";\n\nimport type { IJsonCodec } from \"../../codec/index.js\";\nimport {\n\ttype MutableTreeStoredSchema,\n\ttype TreeStoredSchema,\n\tschemaDataIsEmpty,\n} from \"../../core/index.js\";\nimport {\n\tVersionedSummarizer,\n\ttype Summarizable,\n\ttype SummaryElementParser,\n\ttype SummaryElementStringifier,\n} from \"../../shared-tree-core/index.js\";\nimport type { CollabWindow } from \"../incrementalSummarizationUtils.js\";\n\nexport const schemaStringKey = \"SchemaString\";\n\n/\n The versions for the schema summary format.\n /\nexport const enum SchemaSummaryFormatVersion {\n\t/\n\t This version represents summary format before summary versioning was introduced.\n\t /\n\tv1 = 1,\n\t/\n\t This version adds metadata to the summary. This is backward compatible with version 1.\n\t /\n\tv2 = 2,\n\t/\n\t The latest version of the summary. Must be updated when a new version is added.\n\t /\n\tvLatest = v2,\n}\n\nconst supportedVersions = new Set<SchemaSummaryFormatVersion>([\n\tSchemaSummaryFormatVersion.v1,\n\tSchemaSummaryFormatVersion.v2,\n]);\n\n/\n Returns the summary version to use as per the given minimum version for collab.\n /\nfunction minVersionToSchemaSummaryFormatVersion(\n\tversion: OldestSupportedClientVersion,\n): SchemaSummaryFormatVersion {\n\t// Currently, version 2 is written which adds metadata blob to the summary.\n\treturn SchemaSummaryFormatVersion.v2;\n}\n\n/\n Provides methods for summarizing and loading a schema repository.\n /\nexport class SchemaSummarizer\n\textends VersionedSummarizer<SchemaSummaryFormatVersion>\n\timplements Summarizable\n{\n\tprivate schemaIndexLastChangedSeq: number \| undefined;\n\n\tpublic constructor(\n\t\tprivate readonly schema: MutableTreeStoredSchema,\n\t\tcollabWindow: CollabWindow,\n\t\tprivate readonly codec: IJsonCodec<TreeStoredSchema>,\n\t\tminVersionForCollab: OldestSupportedClientVersion,\n\t) {\n\t\tsuper(\n\t\t\t\"Schema\",\n\t\t\tminVersionToSchemaSummaryFormatVersion(minVersionForCollab),\n\t\t\tsupportedVersions,\n\t\t\ttrue / supportPreVersioningFormat /,\n\t\t);\n\t\tthis.schema.events.on(\"afterSchemaChange\", () => {\n\t\t\t// Invalidate the cache, as we need to regenerate the blob if the schema changes\n\t\t\t// We are assuming that schema changes from remote ops are valid, as we are in a summarization context.\n\t\t\tthis.schemaIndexLastChangedSeq = collabWindow.getCurrentSeq();\n\t\t});\n\t}\n\n\tprotected summarizeInternal(props: {\n\t\tstringify: SummaryElementStringifier;\n\t\tfullTree?: boolean;\n\t\ttrackState?: boolean;\n\t\ttelemetryContext?: ITelemetryContext;\n\t\tincrementalSummaryContext?: IExperimentalIncrementalSummaryContext;\n\t\tbuilder: SummaryTreeBuilder;\n\t}): void {\n\t\tconst { builder, incrementalSummaryContext, stringify, fullTree = false } = props;\n\t\tif (\n\t\t\t!fullTree &&\n\t\t\tincrementalSummaryContext !== undefined &&\n\t\t\tthis.schemaIndexLastChangedSeq !== undefined &&\n\t\t\tincrementalSummaryContext.latestSummarySequenceNumber >= this.schemaIndexLastChangedSeq\n\t\t) {\n\t\t\tbuilder.addHandle(\n\t\t\t\tschemaStringKey,\n\t\t\t\tSummaryType.Blob,\n\t\t\t\t`${incrementalSummaryContext.summaryPath}/${schemaStringKey}`,\n\t\t\t);\n\t\t} else {\n\t\t\tconst dataString = stringify(this.codec.encode(this.schema));\n\t\t\tbuilder.addBlob(schemaStringKey, dataString);\n\t\t}\n\t}\n\n\tprotected async loadInternal(\n\t\tservices: IChannelStorageService,\n\t\tparse: SummaryElementParser,\n\t): Promise<void> {\n\t\tconst schemaBuffer: ArrayBufferLike = await services.readBlob(schemaStringKey);\n\t\t// After the awaits, validate that the schema is in a clean state.\n\t\t// This detects any schema that could have been accidentally added through\n\t\t// invalid means and are about to be overwritten.\n\t\tassert(\n\t\t\tschemaDataIsEmpty(this.schema),\n\t\t\t0x3da / there should not already be stored schema when loading stored schema */,\n\t\t);\n\n\t\tconst schemaString = bufferToString(schemaBuffer, \"utf8\");\n\t\t// Currently no Fluid handles are used, so just use JSON.parse.\n\t\tconst decoded = this.codec.decode(JSON.parse(schemaString));\n\t\tthis.schema.apply(decoded);\n\t\tthis.schemaIndexLastChangedSeq = 0;\n\t}\n}\n"]}
1	+ {"version":3,"file":"schemaSummarizer.js","sourceRoot":"","sources":["../../../src/feature-libraries/schema-index/schemaSummarizer.ts"],"names":[],"mappings":"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","sourcesContent":["/!\n Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n /\n\nimport { bufferToString } from \"@fluid-internal/client-utils\";\nimport { assert } from \"@fluidframework/core-utils/internal\";\nimport type { IChannelStorageService } from \"@fluidframework/datastore-definitions/internal\";\nimport { SummaryType } from \"@fluidframework/driver-definitions\";\nimport type {\n\tIExperimentalIncrementalSummaryContext,\n\tITelemetryContext,\n\tOldestSupportedClientVersion,\n} from \"@fluidframework/runtime-definitions/internal\";\nimport type { SummaryTreeBuilder } from \"@fluidframework/runtime-utils/internal\";\n\nimport type { IJsonCodec } from \"../../codec/index.js\";\nimport {\n\ttype MutableTreeStoredSchema,\n\ttype TreeStoredSchema,\n\tschemaDataIsEmpty,\n} from \"../../core/index.js\";\nimport {\n\tVersionedSummarizer,\n\ttype Summarizable,\n\ttype SummaryElementParser,\n\ttype SummaryElementStringifier,\n} from \"../../shared-tree-core/index.js\";\nimport type { CollabWindow } from \"../incrementalSummarizationUtils.js\";\n\nexport const schemaStringKey = \"SchemaString\";\n\n/\n The versions for the schema summary format.\n /\nexport const enum SchemaSummaryFormatVersion {\n\t/\n\t This version represents summary format before summary versioning was introduced.\n\t /\n\tv1 = 1,\n\t/\n\t This version adds metadata to the summary. This is backward compatible with version 1.\n\t /\n\tv2 = 2,\n\t/\n\t The latest version of the summary. Must be updated when a new version is added.\n\t /\n\tvLatest = v2,\n}\n\nconst supportedVersions = new Set<SchemaSummaryFormatVersion>([\n\tSchemaSummaryFormatVersion.v1,\n\tSchemaSummaryFormatVersion.v2,\n]);\n\n/\n Returns the summary version to use as per the given minimum version for collab.\n /\nfunction minVersionToSchemaSummaryFormatVersion(\n\tversion: OldestSupportedClientVersion,\n): SchemaSummaryFormatVersion {\n\t// Currently, version 2 is written which adds metadata blob to the summary.\n\treturn SchemaSummaryFormatVersion.v2;\n}\n\n/\n Provides methods for summarizing and loading a schema repository.\n /\nexport class SchemaSummarizer\n\textends VersionedSummarizer<SchemaSummaryFormatVersion>\n\timplements Summarizable\n{\n\tprivate schemaIndexLastChangedSeq: number \| undefined;\n\n\tpublic constructor(\n\t\tprivate readonly schema: MutableTreeStoredSchema,\n\t\tcollabWindow: CollabWindow,\n\t\tprivate readonly codec: IJsonCodec<TreeStoredSchema>,\n\t\tminVersionForCollab: OldestSupportedClientVersion,\n\t) {\n\t\tsuper(\n\t\t\t\"Schema\",\n\t\t\tminVersionToSchemaSummaryFormatVersion(minVersionForCollab),\n\t\t\tsupportedVersions,\n\t\t\ttrue / supportPreVersioningFormat /,\n\t\t);\n\t\tthis.schema.events.on(\"afterSchemaChange\", () => {\n\t\t\t// Invalidate the cache, as we need to regenerate the blob if the schema changes\n\t\t\t// We are assuming that schema changes from remote ops are valid, as we are in a summarization context.\n\t\t\tthis.schemaIndexLastChangedSeq = collabWindow.getCurrentSeq();\n\t\t});\n\t}\n\n\tprotected summarizeInternal(props: {\n\t\tstringify: SummaryElementStringifier;\n\t\tfullTree?: boolean;\n\t\ttrackState?: boolean;\n\t\ttelemetryContext?: ITelemetryContext;\n\t\tincrementalSummaryContext?: IExperimentalIncrementalSummaryContext;\n\t\tbuilder: SummaryTreeBuilder;\n\t}): void {\n\t\tconst { builder, incrementalSummaryContext, stringify, fullTree = false } = props;\n\t\tif (\n\t\t\t!fullTree &&\n\t\t\tincrementalSummaryContext !== undefined &&\n\t\t\tthis.schemaIndexLastChangedSeq !== undefined &&\n\t\t\tincrementalSummaryContext.latestSummarySequenceNumber >= this.schemaIndexLastChangedSeq\n\t\t) {\n\t\t\tbuilder.addHandle(\n\t\t\t\tschemaStringKey,\n\t\t\t\tSummaryType.Blob,\n\t\t\t\t`${incrementalSummaryContext.summaryPath}/${schemaStringKey}`,\n\t\t\t);\n\t\t} else {\n\t\t\tconst dataString = stringify(this.codec.encode(this.schema));\n\t\t\tbuilder.addBlob(schemaStringKey, dataString);\n\t\t}\n\t}\n\n\tprotected async loadInternal(\n\t\tservices: IChannelStorageService,\n\t\tparse: SummaryElementParser,\n\t): Promise<void> {\n\t\tconst schemaBuffer: ArrayBufferLike = await services.readBlob(schemaStringKey);\n\t\t// After the awaits, validate that the schema is in a clean state.\n\t\t// This detects any schema that could have been accidentally added through\n\t\t// invalid means and are about to be overwritten.\n\t\tassert(\n\t\t\tschemaDataIsEmpty(this.schema),\n\t\t\t0x3da / there should not already be stored schema when loading stored schema */,\n\t\t);\n\n\t\tconst schemaString = bufferToString(schemaBuffer, \"utf8\");\n\t\t// Currently no Fluid handles are used, so just use JSON.parse.\n\t\tconst decoded = this.codec.decode(JSON.parse(schemaString));\n\t\tthis.schema.apply(decoded);\n\t\tthis.schemaIndexLastChangedSeq = 0;\n\t}\n}\n"]}

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

@@ -260,6 +260,12 @@ function composeMark(mark, moveEffects, composeChild) {
     return withNodeChange(updatedMark, nodeChanges);
 }
 export class ComposeQueue {
+    moveEffects;
+    revisionMetadata;
+    baseMarks;
+    newMarks;
+    baseMarksCellSources;
+    newMarksCellSources;
     constructor(baseMarks, newMarks, moveEffects, revisionMetadata) {
         this.moveEffects = moveEffects;
         this.revisionMetadata = revisionMetadata;

package/lib/feature-libraries/sequence-field/compose.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"compose.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/compose.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, fail } from \"@fluidframework/core-utils/internal\";\n\nimport {\n\ttype ChangeAtomId,\n\ttype RevisionMetadataSource,\n\ttype RevisionTag,\n\toffsetChangeAtomId,\n} from \"../../core/index.js\";\nimport type { IdAllocator } from \"../../util/index.js\";\nimport {\n\ttype CrossFieldManager,\n\tCrossFieldTarget,\n\ttype NodeChangeComposer,\n\ttype NodeId,\n} from \"../modular-schema/index.js\";\n\nimport type { MoveMarkEffect } from \"./helperTypes.js\";\nimport { MarkListFactory } from \"./markListFactory.js\";\nimport { MarkQueue } from \"./markQueue.js\";\nimport {\n\ttype MoveEffect,\n\ttype MoveEffectTable,\n\tgetCrossFieldTargetFromMove,\n\tgetMoveEffect,\n\tgetMoveIn,\n\tisMoveIn,\n\tisMoveMark,\n\tisMoveOut,\n\tsetMoveEffect,\n} from \"./moveEffectTable.js\";\nimport {\n\ttype Attach,\n\ttype CellMark,\n\ttype Changeset,\n\ttype Detach,\n\ttype Mark,\n\ttype MarkEffect,\n\ttype MarkList,\n\ttype MoveId,\n\ttype NoopMark,\n\tNoopMarkType,\n} from \"./types.js\";\nimport {\n\tCellOrder,\n\tareEqualCellIds,\n\tareInputCellsEmpty,\n\tareOutputCellsEmpty,\n\tasAttachAndDetach,\n\tcellSourcesFromMarks,\n\tcompareCellPositionsUsingTombstones,\n\textractMarkEffect,\n\tgetEndpoint,\n\tgetInputCellId,\n\tgetOutputCellId,\n\tisAttach,\n\tisAttachAndDetachEffect,\n\tisDetach,\n\tisImpactfulCellRename,\n\tisNewAttach,\n\tisNoopMark,\n\tisRename,\n\tmarkEmptiesCells,\n\tmarkFillsCells,\n\tmarkHasCellEffect,\n\tnormalizeCellRename,\n\tsettleMark,\n\twithNodeChange,\n\twithRevision,\n} from \"./utils.js\";\n\n/\n Composes a sequence of changesets into a single changeset.\n * @param changes - The changesets to be applied.\n * Parts of the input may be reused in the output, but the input is not mutated.\n * Each changeset in the list is assumed to be applicable after the previous one.\n * @returns A changeset that is equivalent to applying each of the given `changes` in order.\n \n WARNING! This implementation is incomplete:\n * - Tombstone information is ignored.\n * - Support for moves is not implemented.\n * - Support for slices is not implemented.\n /\nexport function compose(\n\tchange1: Changeset,\n\tchange2: Changeset,\n\tcomposeChild: NodeChangeComposer,\n\t_genId: IdAllocator,\n\tmanager: CrossFieldManager,\n\trevisionMetadata: RevisionMetadataSource,\n): Changeset {\n\treturn composeMarkLists(\n\t\tchange1,\n\t\tchange2,\n\t\tcomposeChild,\n\t\tmanager as MoveEffectTable,\n\t\trevisionMetadata,\n\t);\n}\n\nfunction composeMarkLists(\n\tbaseMarkList: MarkList,\n\tnewMarkList: MarkList,\n\tcomposeChild: NodeChangeComposer,\n\tmoveEffects: MoveEffectTable,\n\trevisionMetadata: RevisionMetadataSource,\n): MarkList {\n\tconst factory = new MarkListFactory();\n\tconst queue = new ComposeQueue(baseMarkList, newMarkList, moveEffects, revisionMetadata);\n\twhile (!queue.isEmpty()) {\n\t\tconst { baseMark, newMark } = queue.pop();\n\t\tif (newMark === undefined) {\n\t\t\tassert(\n\t\t\t\tbaseMark !== undefined,\n\t\t\t\t0x4db / Non-empty queue should not return two undefined marks /,\n\t\t\t);\n\t\t\tfactory.push(\n\t\t\t\tcomposeMark(baseMark, moveEffects, (node: NodeId) =>\n\t\t\t\t\tcomposeChildChanges(node, undefined, composeChild),\n\t\t\t\t),\n\t\t\t);\n\t\t} else {\n\t\t\t// We only compose changesets that will not be further rebased.\n\t\t\t// It is therefore safe to remove any intentions that have no impact in the context they apply to.\n\t\t\tconst settledNewMark = settleMark(newMark);\n\t\t\tif (baseMark === undefined) {\n\t\t\t\tfactory.push(\n\t\t\t\t\tcomposeMark(settledNewMark, moveEffects, (node: NodeId) =>\n\t\t\t\t\t\tcomposeChildChanges(undefined, node, composeChild),\n\t\t\t\t\t),\n\t\t\t\t);\n\t\t\t} else {\n\t\t\t\t// Past this point, we are guaranteed that `settledNewMark` and `baseMark` have the same length and\n\t\t\t\t// start at the same location in the revision after the base changes.\n\t\t\t\t// They therefore refer to the same range for that revision.\n\t\t\t\tconst settledBaseMark = settleMark(baseMark);\n\t\t\t\tconst composedMark = composeMarks(\n\t\t\t\t\tsettledBaseMark,\n\t\t\t\t\tsettledNewMark,\n\t\t\t\t\tcomposeChild,\n\t\t\t\t\tmoveEffects,\n\t\t\t\t);\n\t\t\t\tfactory.push(composedMark);\n\t\t\t}\n\t\t}\n\t}\n\n\treturn factory.list;\n}\n\n/\n Composes two marks where `newMark` is based on the state produced by `baseMark`.\n * @param baseMark - The mark to compose with `newMark`.\n * Its output range should be the same as `newMark`'s input range.\n * @param newRev - The revision the new mark is part of.\n * @param newMark - The mark to compose with `baseMark`.\n * Its input range should be the same as `baseMark`'s output range.\n * @returns A mark that is equivalent to applying both `baseMark` and `newMark` successively.\n /\nfunction composeMarks(\n\tbaseMark: Mark,\n\tnewMark: Mark,\n\tcomposeChild: NodeChangeComposer,\n\tmoveEffects: MoveEffectTable,\n): Mark {\n\tconst nodeChange = handleNodeChanges(baseMark, newMark, composeChild, moveEffects);\n\n\treturn withUpdatedEndpoint(\n\t\twithNodeChange(composeMarksIgnoreChild(baseMark, newMark, moveEffects), nodeChange),\n\t\tbaseMark.count,\n\t\tmoveEffects,\n\t);\n}\n\nfunction composeMarksIgnoreChild(\n\tbaseMark: Mark,\n\tnewMark: Mark,\n\tmoveEffects: MoveEffectTable,\n): Mark {\n\tif (isNoopMark(baseMark)) {\n\t\treturn newMark;\n\t} else if (isNoopMark(newMark)) {\n\t\treturn baseMark;\n\t}\n\n\tif (isRename(baseMark) && isRename(newMark)) {\n\t\treturn { ...baseMark, idOverride: newMark.idOverride };\n\t} else if (isRename(baseMark)) {\n\t\tassert(\n\t\t\tisAttach(newMark) \|\| isAttachAndDetachEffect(newMark),\n\t\t\t0x9f1 / Unexpected mark type /,\n\t\t);\n\t\treturn { ...newMark, cellId: baseMark.cellId };\n\t} else if (isRename(newMark)) {\n\t\tassert(\n\t\t\tisDetach(baseMark) \|\| isAttachAndDetachEffect(baseMark),\n\t\t\t0x9f2 / Unexpected mark type /,\n\t\t);\n\t\treturn isDetach(baseMark)\n\t\t\t? { ...baseMark, idOverride: newMark.idOverride }\n\t\t\t: { ...baseMark, detach: { ...baseMark.detach, idOverride: newMark.idOverride } };\n\t}\n\n\tif (isImpactfulCellRename(newMark)) {\n\t\tconst newAttachAndDetach = asAttachAndDetach(newMark);\n\t\tassert(\n\t\t\tnewAttachAndDetach.cellId !== undefined,\n\t\t\t0x9f3 / Impactful cell rename must target empty cell /,\n\t\t);\n\t\tconst newDetachRevision = newAttachAndDetach.detach.revision;\n\t\tif (markEmptiesCells(baseMark)) {\n\t\t\t// baseMark is a detach which cancels with the attach portion of the AttachAndDetach,\n\t\t\t// so we are just left with the detach portion of the AttachAndDetach.\n\t\t\tconst newDetach: CellMark<Detach> = {\n\t\t\t\t...newAttachAndDetach.detach,\n\t\t\t\tcount: baseMark.count,\n\t\t\t};\n\n\t\t\tif (isMoveIn(newAttachAndDetach.attach) && isMoveOut(newAttachAndDetach.detach)) {\n\t\t\t\tassert(isMoveOut(baseMark), 0x808 / Unexpected mark type /);\n\n\t\t\t\t// The base changeset and new changeset both move these nodes.\n\t\t\t\t// Call the original position of the nodes A, the position after the base changeset is applied B,\n\t\t\t\t// and the position after the new changeset is applied C.\n\t\t\t\t// The new changeset moves the nodes from B, temporarily returns them to A, and then moves them to C.\n\t\t\t\t// The composition of the base and new changesets will be a move directly from A to C,\n\t\t\t\t// since the move from A to B cancels out with the return from B to A.\n\t\t\t\t// This if-block is handling marks at A.\n\t\t\t\t// When we compose the marks at B we will link the start of the base move (A to B)\n\t\t\t\t// with the end of the new move (B to C).\n\t\t\t\t// Because we are replacing the mark representing the start of the move with the new changeset's\n\t\t\t\t// move-out from A, we update the base move-in at B to consider that its start point.\n\t\t\t\tconst newDetachId = {\n\t\t\t\t\trevision: newDetachRevision,\n\t\t\t\t\tlocalId: newAttachAndDetach.detach.id,\n\t\t\t\t};\n\n\t\t\t\tsetTruncatedEndpointForInner(\n\t\t\t\t\tmoveEffects,\n\t\t\t\t\tCrossFieldTarget.Destination,\n\t\t\t\t\tgetEndpoint(baseMark),\n\t\t\t\t\tbaseMark.count,\n\t\t\t\t\tnewDetachId,\n\t\t\t\t);\n\n\t\t\t\tconst newEndpoint = getComposedEndpoint(\n\t\t\t\t\tmoveEffects,\n\t\t\t\t\tCrossFieldTarget.Source,\n\t\t\t\t\tbaseMark.revision,\n\t\t\t\t\tbaseMark.id,\n\t\t\t\t\tbaseMark.count,\n\t\t\t\t);\n\n\t\t\t\tif (newEndpoint !== undefined) {\n\t\t\t\t\tchangeFinalEndpoint(newDetach as MoveMarkEffect, newEndpoint);\n\t\t\t\t\tsetTruncatedEndpoint(\n\t\t\t\t\t\tmoveEffects,\n\t\t\t\t\t\tCrossFieldTarget.Destination,\n\t\t\t\t\t\tnewEndpoint,\n\t\t\t\t\t\tbaseMark.count,\n\t\t\t\t\t\tnewDetachId,\n\t\t\t\t\t);\n\t\t\t\t}\n\t\t\t}\n\n\t\t\treturn newDetach;\n\t\t}\n\n\t\tif (isImpactfulCellRename(baseMark)) {\n\t\t\tassert(\n\t\t\t\tbaseMark.cellId !== undefined,\n\t\t\t\t0x9f4 / Impactful cell rename must target empty cell /,\n\t\t\t);\n\t\t\tconst baseAttachAndDetach = asAttachAndDetach(baseMark);\n\t\t\tconst newOutputId = getOutputCellId(newAttachAndDetach);\n\n\t\t\tconst originalAttach = { ...baseAttachAndDetach.attach };\n\t\t\tconst finalDetach = { ...newAttachAndDetach.detach };\n\n\t\t\thandleMovePivot(baseMark.count, originalAttach, finalDetach, moveEffects);\n\n\t\t\tif (areEqualCellIds(newOutputId, baseAttachAndDetach.cellId)) {\n\t\t\t\treturn { count: baseAttachAndDetach.count, cellId: baseAttachAndDetach.cellId };\n\t\t\t}\n\n\t\t\t// `newMark`'s attach portion cancels with `baseMark`'s detach portion.\n\t\t\tconst detachRevision = finalDetach.revision;\n\t\t\tif (detachRevision !== undefined) {\n\t\t\t\tfinalDetach.revision = detachRevision;\n\t\t\t}\n\n\t\t\treturn normalizeCellRename(baseMark.cellId, baseMark.count, originalAttach, finalDetach);\n\t\t}\n\n\t\treturn normalizeCellRename(\n\t\t\tnewAttachAndDetach.cellId,\n\t\t\tnewAttachAndDetach.count,\n\t\t\tnewAttachAndDetach.attach,\n\t\t\tnewAttachAndDetach.detach,\n\t\t);\n\t}\n\tif (isImpactfulCellRename(baseMark)) {\n\t\tconst baseAttachAndDetach = asAttachAndDetach(baseMark);\n\t\tif (markFillsCells(newMark)) {\n\t\t\tconst originalAttach = withRevision(\n\t\t\t\t{\n\t\t\t\t\t...baseAttachAndDetach.attach,\n\t\t\t\t\tcellId: baseAttachAndDetach.cellId,\n\t\t\t\t\tcount: baseAttachAndDetach.count,\n\t\t\t\t},\n\t\t\t\tbaseAttachAndDetach.attach.revision,\n\t\t\t);\n\n\t\t\tif (isMoveIn(baseAttachAndDetach.attach) && isMoveOut(baseAttachAndDetach.detach)) {\n\t\t\t\tassert(isMoveIn(newMark), 0x809 / Unexpected mark type /);\n\n\t\t\t\tconst originalAttachId = {\n\t\t\t\t\trevision: baseAttachAndDetach.attach.revision,\n\t\t\t\t\tlocalId: baseAttachAndDetach.attach.id,\n\t\t\t\t};\n\n\t\t\t\tsetTruncatedEndpointForInner(\n\t\t\t\t\tmoveEffects,\n\t\t\t\t\tCrossFieldTarget.Source,\n\t\t\t\t\tgetEndpoint(newMark),\n\t\t\t\t\tbaseAttachAndDetach.count,\n\t\t\t\t\toriginalAttachId,\n\t\t\t\t);\n\n\t\t\t\tconst newEndpoint = getComposedEndpoint(\n\t\t\t\t\tmoveEffects,\n\t\t\t\t\tCrossFieldTarget.Destination,\n\t\t\t\t\tnewMark.revision,\n\t\t\t\t\tnewMark.id,\n\t\t\t\t\tnewMark.count,\n\t\t\t\t);\n\n\t\t\t\tif (newEndpoint !== undefined) {\n\t\t\t\t\tchangeFinalEndpoint(originalAttach as MoveMarkEffect, newEndpoint);\n\t\t\t\t\tsetTruncatedEndpoint(\n\t\t\t\t\t\tmoveEffects,\n\t\t\t\t\t\tCrossFieldTarget.Source,\n\t\t\t\t\t\tnewEndpoint,\n\t\t\t\t\t\tbaseMark.count,\n\t\t\t\t\t\toriginalAttachId,\n\t\t\t\t\t);\n\t\t\t\t}\n\t\t\t}\n\n\t\t\treturn originalAttach;\n\t\t} else {\n\t\t\t// Other mark types have been handled by previous conditional branches.\n\t\t\tassert(newMark.type === NoopMarkType, 0x80a / Unexpected mark type /);\n\t\t\treturn baseMark;\n\t\t}\n\t}\n\n\tif (!markHasCellEffect(baseMark) && !markHasCellEffect(newMark)) {\n\t\treturn createNoopMark(newMark.count, undefined, getInputCellId(baseMark));\n\t} else if (!markHasCellEffect(baseMark)) {\n\t\treturn newMark;\n\t} else if (!markHasCellEffect(newMark)) {\n\t\treturn baseMark;\n\t} else if (areInputCellsEmpty(baseMark)) {\n\t\tassert(isDetach(newMark), 0x71c / Unexpected mark type /);\n\t\tassert(isAttach(baseMark), 0x71d / Expected generative mark /);\n\n\t\tconst attach = extractMarkEffect(baseMark);\n\t\tconst detach = extractMarkEffect(newMark);\n\n\t\thandleMovePivot(baseMark.count, attach, detach, moveEffects);\n\n\t\tif (areEqualCellIds(getOutputCellId(newMark), baseMark.cellId)) {\n\t\t\t// The output and input cell IDs are the same, so this mark has no effect.\n\t\t\treturn { count: baseMark.count, cellId: baseMark.cellId };\n\t\t}\n\t\treturn normalizeCellRename(baseMark.cellId, baseMark.count, attach, detach);\n\t} else {\n\t\tconst length = baseMark.count;\n\t\treturn createNoopMark(length, undefined);\n\t}\n}\n\n/\n Checks if `baseAttach` and `newDetach` are both moves, and if so updates their move endpoints as appropriate,\n * and removes their `finalEndpoint` endpoint fields. Note that can mutate `baseAttach` and `newDetach`.\n * If the effects are not both moves this function does nothing.\n * @param count - The number of cells targeted\n * @param baseAttach - The base attach effect at this location\n * @param newDetach - The new detach effect at this location\n /\nfunction handleMovePivot(\n\tcount: number,\n\tbaseAttach: Attach,\n\tnewDetach: Detach,\n\tmoveEffects: MoveEffectTable,\n): void {\n\tif (isMoveIn(baseAttach) && isMoveOut(newDetach)) {\n\t\tconst finalSource = getEndpoint(baseAttach);\n\t\tconst finalDest = getEndpoint(newDetach);\n\n\t\tsetEndpoint(moveEffects, CrossFieldTarget.Source, finalSource, count, finalDest);\n\n\t\tconst truncatedEndpoint1 = getTruncatedEndpointForInner(\n\t\t\tmoveEffects,\n\t\t\tCrossFieldTarget.Destination,\n\t\t\tbaseAttach.revision,\n\t\t\tbaseAttach.id,\n\t\t\tcount,\n\t\t);\n\n\t\tif (truncatedEndpoint1 !== undefined) {\n\t\t\tsetTruncatedEndpoint(\n\t\t\t\tmoveEffects,\n\t\t\t\tCrossFieldTarget.Destination,\n\t\t\t\tfinalDest,\n\t\t\t\tcount,\n\t\t\t\ttruncatedEndpoint1,\n\t\t\t);\n\t\t}\n\n\t\tsetEndpoint(moveEffects, CrossFieldTarget.Destination, finalDest, count, finalSource);\n\n\t\tconst truncatedEndpoint2 = getTruncatedEndpointForInner(\n\t\t\tmoveEffects,\n\t\t\tCrossFieldTarget.Source,\n\t\t\tnewDetach.revision,\n\t\t\tnewDetach.id,\n\t\t\tcount,\n\t\t);\n\n\t\tif (truncatedEndpoint2 !== undefined) {\n\t\t\tsetTruncatedEndpoint(\n\t\t\t\tmoveEffects,\n\t\t\t\tCrossFieldTarget.Source,\n\t\t\t\tfinalSource,\n\t\t\t\tcount,\n\t\t\t\ttruncatedEndpoint2,\n\t\t\t);\n\t\t}\n\n\t\t// The `finalEndpoint` field of AttachAndDetach move effect pairs is not used,\n\t\t// so we remove it as a normalization.\n\t\tdelete baseAttach.finalEndpoint;\n\t\tdelete newDetach.finalEndpoint;\n\t}\n}\n\nfunction createNoopMark(\n\tlength: number,\n\tnodeChange: NodeId \| undefined,\n\tcellId?: ChangeAtomId,\n): Mark {\n\tconst mark: CellMark<NoopMark> = { count: length };\n\tif (nodeChange !== undefined) {\n\t\tassert(length === 1, 0x692 / A mark with a node change must have length one /);\n\t\tmark.changes = nodeChange;\n\t}\n\tif (cellId !== undefined) {\n\t\tmark.cellId = cellId;\n\t}\n\treturn mark;\n}\n\nfunction handleNodeChanges(\n\tbaseMark: Mark,\n\tnewMark: Mark,\n\tcomposeChild: NodeChangeComposer,\n\tmoveEffects: MoveEffectTable,\n): NodeId \| undefined {\n\tif (newMark.changes !== undefined) {\n\t\tmoveEffects.onMoveIn(newMark.changes);\n\t\tconst baseSource = getMoveIn(baseMark);\n\n\t\t// TODO: Make sure composeChild is not called twice on the node changes.\n\t\tif (baseSource !== undefined) {\n\t\t\tsetModifyAfter(moveEffects, getEndpoint(baseSource), newMark.changes);\n\t\t\treturn undefined;\n\t\t}\n\t}\n\n\treturn composeChildChanges(baseMark.changes, newMark.changes, composeChild);\n}\n\nfunction composeChildChanges(\n\tbaseChange: NodeId \| undefined,\n\tnewChange: NodeId \| undefined,\n\tcomposeChild: NodeChangeComposer,\n): NodeId \| undefined {\n\tif (baseChange === undefined && newChange === undefined) {\n\t\treturn undefined;\n\t}\n\n\treturn composeChild(baseChange, newChange);\n}\n\nfunction composeMark<TMark extends Mark>(\n\tmark: TMark,\n\tmoveEffects: MoveEffectTable,\n\tcomposeChild: (node: NodeId) => NodeId \| undefined,\n): TMark {\n\tconst nodeChanges = mark.changes === undefined ? undefined : composeChild(mark.changes);\n\tconst updatedMark = withUpdatedEndpoint(mark, mark.count, moveEffects);\n\treturn withNodeChange(updatedMark, nodeChanges);\n}\n\nexport class ComposeQueue {\n\tprivate readonly baseMarks: MarkQueue;\n\tprivate readonly newMarks: MarkQueue;\n\tprivate readonly baseMarksCellSources: ReadonlySet<RevisionTag \| undefined>;\n\tprivate readonly newMarksCellSources: ReadonlySet<RevisionTag \| undefined>;\n\n\tpublic constructor(\n\t\tbaseMarks: Changeset,\n\t\tnewMarks: Changeset,\n\t\tprivate readonly moveEffects: MoveEffectTable,\n\t\tprivate readonly revisionMetadata: RevisionMetadataSource,\n\t) {\n\t\tthis.baseMarks = new MarkQueue(baseMarks, moveEffects);\n\t\tthis.newMarks = new MarkQueue(newMarks, moveEffects);\n\t\tthis.baseMarksCellSources = cellSourcesFromMarks(baseMarks, getOutputCellId);\n\t\tthis.newMarksCellSources = cellSourcesFromMarks(newMarks, getInputCellId);\n\t}\n\n\tpublic isEmpty(): boolean {\n\t\treturn this.baseMarks.isEmpty() && this.newMarks.isEmpty();\n\t}\n\n\tpublic pop(): ComposeMarks {\n\t\tconst baseMark = this.baseMarks.peek();\n\t\tconst newMark = this.newMarks.peek();\n\t\tif (baseMark === undefined && newMark === undefined) {\n\t\t\treturn {};\n\t\t} else if (baseMark === undefined) {\n\t\t\treturn this.dequeueNew();\n\t\t} else if (newMark === undefined) {\n\t\t\treturn this.dequeueBase();\n\t\t} else if (areOutputCellsEmpty(baseMark) && areInputCellsEmpty(newMark)) {\n\t\t\tconst baseCellId: ChangeAtomId =\n\t\t\t\tgetOutputCellId(baseMark) ?? fail(0xb29 / Expected defined output ID /);\n\n\t\t\tif (markEmptiesCells(baseMark) && baseCellId.revision === undefined) {\n\t\t\t\t// The base revision should always be defined except when squashing changes into a transaction.\n\t\t\t\t// In the future, we want to support reattaches in the new change here.\n\t\t\t\t// We will need to be able to order the base mark relative to the new mark\n\t\t\t\t// (which requires the local changes to have a revision tag))\n\t\t\t\tassert(\n\t\t\t\t\tisNewAttach(newMark),\n\t\t\t\t\t0x695 / TODO: Assign revision tags to each change in a transaction /,\n\t\t\t\t);\n\t\t\t\treturn this.dequeueNew();\n\t\t\t}\n\n\t\t\tconst newCellId = getInputCellId(newMark);\n\t\t\tassert(newCellId !== undefined, 0x89d / Both marks should have cell IDs /);\n\t\t\tconst comparison = compareCellPositionsUsingTombstones(\n\t\t\t\tbaseCellId,\n\t\t\t\tnewCellId,\n\t\t\t\tthis.baseMarksCellSources,\n\t\t\t\tthis.newMarksCellSources,\n\t\t\t\tthis.revisionMetadata,\n\t\t\t);\n\t\t\tswitch (comparison) {\n\t\t\t\tcase CellOrder.SameCell: {\n\t\t\t\t\treturn this.dequeueBoth();\n\t\t\t\t}\n\t\t\t\tcase CellOrder.OldThenNew: {\n\t\t\t\t\treturn this.dequeueBase();\n\t\t\t\t}\n\t\t\t\tcase CellOrder.NewThenOld: {\n\t\t\t\t\treturn this.dequeueNew();\n\t\t\t\t}\n\t\t\t\tdefault: {\n\t\t\t\t\tunreachableCase(comparison);\n\t\t\t\t}\n\t\t\t}\n\t\t} else if (areOutputCellsEmpty(baseMark)) {\n\t\t\treturn this.dequeueBase();\n\t\t} else if (areInputCellsEmpty(newMark)) {\n\t\t\treturn this.dequeueNew();\n\t\t} else {\n\t\t\treturn this.dequeueBoth();\n\t\t}\n\t}\n\n\tprivate dequeueBase(length: number = Number.POSITIVE_INFINITY): ComposeMarks {\n\t\tconst baseMark = this.baseMarks.dequeueUpTo(length);\n\t\tconst movedChanges = getMovedChangesFromMark(this.moveEffects, baseMark);\n\t\tconst newMark = createNoopMark(baseMark.count, movedChanges, getOutputCellId(baseMark));\n\t\treturn { baseMark, newMark };\n\t}\n\n\tprivate dequeueNew(length: number = Number.POSITIVE_INFINITY): ComposeMarks {\n\t\tconst newMark = this.newMarks.dequeueUpTo(length);\n\t\tconst baseMark = createNoopMark(newMark.count, undefined, getInputCellId(newMark));\n\n\t\treturn {\n\t\t\tbaseMark,\n\t\t\tnewMark,\n\t\t};\n\t}\n\n\tprivate dequeueBoth(): ComposeMarks {\n\t\tconst length = this.peekMinLength();\n\t\tconst baseMark = this.baseMarks.dequeueUpTo(length);\n\t\tlet newMark = this.newMarks.dequeueUpTo(length);\n\t\tconst movedChanges = getMovedChangesFromMark(this.moveEffects, baseMark);\n\n\t\tif (movedChanges !== undefined) {\n\t\t\tassert(newMark.changes === undefined, 0x8da / Unexpected node changeset collision /);\n\t\t\tnewMark = withNodeChange(newMark, movedChanges);\n\t\t}\n\n\t\treturn {\n\t\t\tbaseMark,\n\t\t\tnewMark,\n\t\t};\n\t}\n\n\tprivate peekMinLength(): number {\n\t\tconst baseMark = this.baseMarks.peek();\n\t\tconst newMark = this.newMarks.peek();\n\t\tassert(\n\t\t\tbaseMark !== undefined && newMark !== undefined,\n\t\t\t0x8db / Cannot peek length unless both mark queues are non-empty /,\n\t\t);\n\n\t\treturn Math.min(newMark.count, baseMark.count);\n\t}\n}\n\ninterface ComposeMarks {\n\tbaseMark?: Mark;\n\tnewMark?: Mark;\n}\n\nfunction getMovedChangesFromMark(\n\tmoveEffects: MoveEffectTable,\n\tmarkEffect: MarkEffect,\n): NodeId \| undefined {\n\tif (isAttachAndDetachEffect(markEffect)) {\n\t\treturn getMovedChangesFromMark(moveEffects, markEffect.detach);\n\t}\n\tif (!isMoveOut(markEffect)) {\n\t\treturn undefined;\n\t}\n\n\treturn getModifyAfter(moveEffects, markEffect.revision, markEffect.id);\n}\n\n// It is expected that the range from `id` to `id + count - 1` has the same move effect.\n// The call sites to this function are making queries about a mark which has already been split by a `MarkQueue`\n// to match the ranges in `moveEffects`.\n// TODO: Reduce the duplication between this and other MoveEffect helpers\nfunction getModifyAfter(\n\tmoveEffects: MoveEffectTable,\n\trevision: RevisionTag \| undefined,\n\tid: MoveId,\n): NodeId \| undefined {\n\tconst target = CrossFieldTarget.Source;\n\tconst effect = getMoveEffect(moveEffects, target, revision, id, 1);\n\n\tif (effect.value?.modifyAfter !== undefined) {\n\t\treturn effect.value.modifyAfter;\n\t}\n\n\treturn undefined;\n}\n\n// TODO: Reduce the duplication between this and other MoveEffect helpers\nfunction setModifyAfter(\n\tmoveEffects: MoveEffectTable,\n\t{ revision, localId: id }: ChangeAtomId,\n\tmodifyAfter: NodeId,\n): void {\n\tconst target = CrossFieldTarget.Source;\n\tconst count = 1;\n\tconst effect = getMoveEffect(moveEffects, target, revision, id, count, false);\n\tconst newEffect: MoveEffect =\n\t\teffect.value === undefined ? { modifyAfter } : { ...effect.value, modifyAfter };\n\tsetMoveEffect(moveEffects, target, revision, id, count, newEffect);\n}\n\nfunction setEndpoint(\n\tmoveEffects: MoveEffectTable,\n\ttarget: CrossFieldTarget,\n\tid: ChangeAtomId,\n\tcount: number,\n\tendpoint: ChangeAtomId,\n): void {\n\tconst effect = getMoveEffect(moveEffects, target, id.revision, id.localId, count, false);\n\tconst newEffect = effect.value === undefined ? { endpoint } : { ...effect.value, endpoint };\n\tsetMoveEffect(moveEffects, target, id.revision, id.localId, effect.length, newEffect);\n\n\tconst remainingCount = count - effect.length;\n\tif (remainingCount > 0) {\n\t\tsetEndpoint(\n\t\t\tmoveEffects,\n\t\t\ttarget,\n\t\t\toffsetChangeAtomId(id, effect.length),\n\t\t\tremainingCount,\n\t\t\toffsetChangeAtomId(endpoint, effect.length),\n\t\t);\n\t}\n}\n\nfunction setTruncatedEndpoint(\n\tmoveEffects: MoveEffectTable,\n\ttarget: CrossFieldTarget,\n\tid: ChangeAtomId,\n\tcount: number,\n\ttruncatedEndpoint: ChangeAtomId,\n): void {\n\tconst effect = getMoveEffect(moveEffects, target, id.revision, id.localId, count);\n\tconst newEffect =\n\t\teffect.value === undefined\n\t\t\t? { truncatedEndpoint }\n\t\t\t: { ...effect.value, truncatedEndpoint };\n\n\tsetMoveEffect(moveEffects, target, id.revision, id.localId, effect.length, newEffect);\n\n\tconst remainingCount = count - effect.length;\n\tif (remainingCount > 0) {\n\t\tsetTruncatedEndpoint(\n\t\t\tmoveEffects,\n\t\t\ttarget,\n\t\t\toffsetChangeAtomId(id, effect.length),\n\t\t\tremainingCount,\n\t\t\toffsetChangeAtomId(truncatedEndpoint, effect.length),\n\t\t);\n\t}\n}\n\nfunction setTruncatedEndpointForInner(\n\tmoveEffects: MoveEffectTable,\n\ttarget: CrossFieldTarget,\n\tid: ChangeAtomId,\n\tcount: number,\n\ttruncatedEndpointForInner: ChangeAtomId,\n): void {\n\tconst effect = getMoveEffect(moveEffects, target, id.revision, id.localId, count);\n\tconst newEffect =\n\t\teffect.value === undefined\n\t\t\t? { truncatedEndpointForInner }\n\t\t\t: { ...effect.value, truncatedEndpointForInner };\n\tsetMoveEffect(moveEffects, target, id.revision, id.localId, effect.length, newEffect);\n\n\tconst remainingCount = count - effect.length;\n\tif (remainingCount > 0) {\n\t\tsetTruncatedEndpointForInner(\n\t\t\tmoveEffects,\n\t\t\ttarget,\n\t\t\toffsetChangeAtomId(id, effect.length),\n\t\t\tremainingCount,\n\t\t\toffsetChangeAtomId(truncatedEndpointForInner, effect.length),\n\t\t);\n\t}\n}\n\nfunction withUpdatedEndpoint<TMark extends MarkEffect>(\n\tmark: TMark,\n\tcount: number,\n\teffects: MoveEffectTable,\n): TMark {\n\tif (isAttachAndDetachEffect(mark)) {\n\t\treturn {\n\t\t\t...mark,\n\t\t\tattach: withUpdatedEndpoint(mark.attach, count, effects),\n\t\t\tdetach: withUpdatedEndpoint(mark.detach, count, effects),\n\t\t};\n\t}\n\n\tif (!isMoveMark(mark)) {\n\t\treturn mark;\n\t}\n\tconst finalDest = getComposedEndpoint(\n\t\teffects,\n\t\tgetCrossFieldTargetFromMove(mark),\n\t\tmark.revision,\n\t\tmark.id,\n\t\tcount,\n\t);\n\n\tif (finalDest === undefined) {\n\t\treturn mark;\n\t}\n\n\tconst output = { ...mark };\n\tchangeFinalEndpoint(output, finalDest);\n\n\treturn output;\n}\n\nfunction changeFinalEndpoint(mark: MoveMarkEffect, endpoint: ChangeAtomId): void {\n\tif (areEqualCellIds(endpoint, { revision: mark.revision, localId: mark.id })) {\n\t\tdelete mark.finalEndpoint;\n\t} else {\n\t\tmark.finalEndpoint = endpoint;\n\t}\n}\n\nfunction getComposedEndpoint(\n\tmoveEffects: MoveEffectTable,\n\ttarget: CrossFieldTarget,\n\trevision: RevisionTag \| undefined,\n\tid: MoveId,\n\tcount: number,\n): ChangeAtomId \| undefined {\n\tconst effect = getMoveEffect(moveEffects, target, revision, id, count);\n\tassert(effect.length === count, 0x815 / Expected effect to cover entire mark /);\n\treturn effect.value?.truncatedEndpoint ?? effect.value?.endpoint;\n}\n\nfunction getTruncatedEndpointForInner(\n\tmoveEffects: MoveEffectTable,\n\ttarget: CrossFieldTarget,\n\trevision: RevisionTag \| undefined,\n\tid: MoveId,\n\tcount: number,\n): ChangeAtomId \| undefined {\n\tconst effect = getMoveEffect(moveEffects, target, revision, id, count);\n\tassert(effect.length === count, 0x934 / Expected effect to cover entire mark */);\n\treturn effect.value?.truncatedEndpointForInner;\n}\n"]}
1	+ {"version":3,"file":"compose.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/compose.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, fail } from \"@fluidframework/core-utils/internal\";\n\nimport {\n\ttype ChangeAtomId,\n\ttype RevisionMetadataSource,\n\ttype RevisionTag,\n\toffsetChangeAtomId,\n} from \"../../core/index.js\";\nimport type { IdAllocator } from \"../../util/index.js\";\nimport {\n\ttype CrossFieldManager,\n\tCrossFieldTarget,\n\ttype NodeChangeComposer,\n\ttype NodeId,\n} from \"../modular-schema/index.js\";\n\nimport type { MoveMarkEffect } from \"./helperTypes.js\";\nimport { MarkListFactory } from \"./markListFactory.js\";\nimport { MarkQueue } from \"./markQueue.js\";\nimport {\n\ttype MoveEffect,\n\ttype MoveEffectTable,\n\tgetCrossFieldTargetFromMove,\n\tgetMoveEffect,\n\tgetMoveIn,\n\tisMoveIn,\n\tisMoveMark,\n\tisMoveOut,\n\tsetMoveEffect,\n} from \"./moveEffectTable.js\";\nimport {\n\ttype Attach,\n\ttype CellMark,\n\ttype Changeset,\n\ttype Detach,\n\ttype Mark,\n\ttype MarkEffect,\n\ttype MarkList,\n\ttype MoveId,\n\ttype NoopMark,\n\tNoopMarkType,\n} from \"./types.js\";\nimport {\n\tCellOrder,\n\tareEqualCellIds,\n\tareInputCellsEmpty,\n\tareOutputCellsEmpty,\n\tasAttachAndDetach,\n\tcellSourcesFromMarks,\n\tcompareCellPositionsUsingTombstones,\n\textractMarkEffect,\n\tgetEndpoint,\n\tgetInputCellId,\n\tgetOutputCellId,\n\tisAttach,\n\tisAttachAndDetachEffect,\n\tisDetach,\n\tisImpactfulCellRename,\n\tisNewAttach,\n\tisNoopMark,\n\tisRename,\n\tmarkEmptiesCells,\n\tmarkFillsCells,\n\tmarkHasCellEffect,\n\tnormalizeCellRename,\n\tsettleMark,\n\twithNodeChange,\n\twithRevision,\n} from \"./utils.js\";\n\n/\n Composes a sequence of changesets into a single changeset.\n * @param changes - The changesets to be applied.\n * Parts of the input may be reused in the output, but the input is not mutated.\n * Each changeset in the list is assumed to be applicable after the previous one.\n * @returns A changeset that is equivalent to applying each of the given `changes` in order.\n \n WARNING! This implementation is incomplete:\n * - Tombstone information is ignored.\n * - Support for moves is not implemented.\n * - Support for slices is not implemented.\n /\nexport function compose(\n\tchange1: Changeset,\n\tchange2: Changeset,\n\tcomposeChild: NodeChangeComposer,\n\t_genId: IdAllocator,\n\tmanager: CrossFieldManager,\n\trevisionMetadata: RevisionMetadataSource,\n): Changeset {\n\treturn composeMarkLists(\n\t\tchange1,\n\t\tchange2,\n\t\tcomposeChild,\n\t\tmanager as MoveEffectTable,\n\t\trevisionMetadata,\n\t);\n}\n\nfunction composeMarkLists(\n\tbaseMarkList: MarkList,\n\tnewMarkList: MarkList,\n\tcomposeChild: NodeChangeComposer,\n\tmoveEffects: MoveEffectTable,\n\trevisionMetadata: RevisionMetadataSource,\n): MarkList {\n\tconst factory = new MarkListFactory();\n\tconst queue = new ComposeQueue(baseMarkList, newMarkList, moveEffects, revisionMetadata);\n\twhile (!queue.isEmpty()) {\n\t\tconst { baseMark, newMark } = queue.pop();\n\t\tif (newMark === undefined) {\n\t\t\tassert(\n\t\t\t\tbaseMark !== undefined,\n\t\t\t\t0x4db / Non-empty queue should not return two undefined marks /,\n\t\t\t);\n\t\t\tfactory.push(\n\t\t\t\tcomposeMark(baseMark, moveEffects, (node: NodeId) =>\n\t\t\t\t\tcomposeChildChanges(node, undefined, composeChild),\n\t\t\t\t),\n\t\t\t);\n\t\t} else {\n\t\t\t// We only compose changesets that will not be further rebased.\n\t\t\t// It is therefore safe to remove any intentions that have no impact in the context they apply to.\n\t\t\tconst settledNewMark = settleMark(newMark);\n\t\t\tif (baseMark === undefined) {\n\t\t\t\tfactory.push(\n\t\t\t\t\tcomposeMark(settledNewMark, moveEffects, (node: NodeId) =>\n\t\t\t\t\t\tcomposeChildChanges(undefined, node, composeChild),\n\t\t\t\t\t),\n\t\t\t\t);\n\t\t\t} else {\n\t\t\t\t// Past this point, we are guaranteed that `settledNewMark` and `baseMark` have the same length and\n\t\t\t\t// start at the same location in the revision after the base changes.\n\t\t\t\t// They therefore refer to the same range for that revision.\n\t\t\t\tconst settledBaseMark = settleMark(baseMark);\n\t\t\t\tconst composedMark = composeMarks(\n\t\t\t\t\tsettledBaseMark,\n\t\t\t\t\tsettledNewMark,\n\t\t\t\t\tcomposeChild,\n\t\t\t\t\tmoveEffects,\n\t\t\t\t);\n\t\t\t\tfactory.push(composedMark);\n\t\t\t}\n\t\t}\n\t}\n\n\treturn factory.list;\n}\n\n/\n Composes two marks where `newMark` is based on the state produced by `baseMark`.\n * @param baseMark - The mark to compose with `newMark`.\n * Its output range should be the same as `newMark`'s input range.\n * @param newRev - The revision the new mark is part of.\n * @param newMark - The mark to compose with `baseMark`.\n * Its input range should be the same as `baseMark`'s output range.\n * @returns A mark that is equivalent to applying both `baseMark` and `newMark` successively.\n /\nfunction composeMarks(\n\tbaseMark: Mark,\n\tnewMark: Mark,\n\tcomposeChild: NodeChangeComposer,\n\tmoveEffects: MoveEffectTable,\n): Mark {\n\tconst nodeChange = handleNodeChanges(baseMark, newMark, composeChild, moveEffects);\n\n\treturn withUpdatedEndpoint(\n\t\twithNodeChange(composeMarksIgnoreChild(baseMark, newMark, moveEffects), nodeChange),\n\t\tbaseMark.count,\n\t\tmoveEffects,\n\t);\n}\n\nfunction composeMarksIgnoreChild(\n\tbaseMark: Mark,\n\tnewMark: Mark,\n\tmoveEffects: MoveEffectTable,\n): Mark {\n\tif (isNoopMark(baseMark)) {\n\t\treturn newMark;\n\t} else if (isNoopMark(newMark)) {\n\t\treturn baseMark;\n\t}\n\n\tif (isRename(baseMark) && isRename(newMark)) {\n\t\treturn { ...baseMark, idOverride: newMark.idOverride };\n\t} else if (isRename(baseMark)) {\n\t\tassert(\n\t\t\tisAttach(newMark) \|\| isAttachAndDetachEffect(newMark),\n\t\t\t0x9f1 / Unexpected mark type /,\n\t\t);\n\t\treturn { ...newMark, cellId: baseMark.cellId };\n\t} else if (isRename(newMark)) {\n\t\tassert(\n\t\t\tisDetach(baseMark) \|\| isAttachAndDetachEffect(baseMark),\n\t\t\t0x9f2 / Unexpected mark type /,\n\t\t);\n\t\treturn isDetach(baseMark)\n\t\t\t? { ...baseMark, idOverride: newMark.idOverride }\n\t\t\t: { ...baseMark, detach: { ...baseMark.detach, idOverride: newMark.idOverride } };\n\t}\n\n\tif (isImpactfulCellRename(newMark)) {\n\t\tconst newAttachAndDetach = asAttachAndDetach(newMark);\n\t\tassert(\n\t\t\tnewAttachAndDetach.cellId !== undefined,\n\t\t\t0x9f3 / Impactful cell rename must target empty cell /,\n\t\t);\n\t\tconst newDetachRevision = newAttachAndDetach.detach.revision;\n\t\tif (markEmptiesCells(baseMark)) {\n\t\t\t// baseMark is a detach which cancels with the attach portion of the AttachAndDetach,\n\t\t\t// so we are just left with the detach portion of the AttachAndDetach.\n\t\t\tconst newDetach: CellMark<Detach> = {\n\t\t\t\t...newAttachAndDetach.detach,\n\t\t\t\tcount: baseMark.count,\n\t\t\t};\n\n\t\t\tif (isMoveIn(newAttachAndDetach.attach) && isMoveOut(newAttachAndDetach.detach)) {\n\t\t\t\tassert(isMoveOut(baseMark), 0x808 / Unexpected mark type /);\n\n\t\t\t\t// The base changeset and new changeset both move these nodes.\n\t\t\t\t// Call the original position of the nodes A, the position after the base changeset is applied B,\n\t\t\t\t// and the position after the new changeset is applied C.\n\t\t\t\t// The new changeset moves the nodes from B, temporarily returns them to A, and then moves them to C.\n\t\t\t\t// The composition of the base and new changesets will be a move directly from A to C,\n\t\t\t\t// since the move from A to B cancels out with the return from B to A.\n\t\t\t\t// This if-block is handling marks at A.\n\t\t\t\t// When we compose the marks at B we will link the start of the base move (A to B)\n\t\t\t\t// with the end of the new move (B to C).\n\t\t\t\t// Because we are replacing the mark representing the start of the move with the new changeset's\n\t\t\t\t// move-out from A, we update the base move-in at B to consider that its start point.\n\t\t\t\tconst newDetachId = {\n\t\t\t\t\trevision: newDetachRevision,\n\t\t\t\t\tlocalId: newAttachAndDetach.detach.id,\n\t\t\t\t};\n\n\t\t\t\tsetTruncatedEndpointForInner(\n\t\t\t\t\tmoveEffects,\n\t\t\t\t\tCrossFieldTarget.Destination,\n\t\t\t\t\tgetEndpoint(baseMark),\n\t\t\t\t\tbaseMark.count,\n\t\t\t\t\tnewDetachId,\n\t\t\t\t);\n\n\t\t\t\tconst newEndpoint = getComposedEndpoint(\n\t\t\t\t\tmoveEffects,\n\t\t\t\t\tCrossFieldTarget.Source,\n\t\t\t\t\tbaseMark.revision,\n\t\t\t\t\tbaseMark.id,\n\t\t\t\t\tbaseMark.count,\n\t\t\t\t);\n\n\t\t\t\tif (newEndpoint !== undefined) {\n\t\t\t\t\tchangeFinalEndpoint(newDetach as MoveMarkEffect, newEndpoint);\n\t\t\t\t\tsetTruncatedEndpoint(\n\t\t\t\t\t\tmoveEffects,\n\t\t\t\t\t\tCrossFieldTarget.Destination,\n\t\t\t\t\t\tnewEndpoint,\n\t\t\t\t\t\tbaseMark.count,\n\t\t\t\t\t\tnewDetachId,\n\t\t\t\t\t);\n\t\t\t\t}\n\t\t\t}\n\n\t\t\treturn newDetach;\n\t\t}\n\n\t\tif (isImpactfulCellRename(baseMark)) {\n\t\t\tassert(\n\t\t\t\tbaseMark.cellId !== undefined,\n\t\t\t\t0x9f4 / Impactful cell rename must target empty cell /,\n\t\t\t);\n\t\t\tconst baseAttachAndDetach = asAttachAndDetach(baseMark);\n\t\t\tconst newOutputId = getOutputCellId(newAttachAndDetach);\n\n\t\t\tconst originalAttach = { ...baseAttachAndDetach.attach };\n\t\t\tconst finalDetach = { ...newAttachAndDetach.detach };\n\n\t\t\thandleMovePivot(baseMark.count, originalAttach, finalDetach, moveEffects);\n\n\t\t\tif (areEqualCellIds(newOutputId, baseAttachAndDetach.cellId)) {\n\t\t\t\treturn { count: baseAttachAndDetach.count, cellId: baseAttachAndDetach.cellId };\n\t\t\t}\n\n\t\t\t// `newMark`'s attach portion cancels with `baseMark`'s detach portion.\n\t\t\tconst detachRevision = finalDetach.revision;\n\t\t\tif (detachRevision !== undefined) {\n\t\t\t\tfinalDetach.revision = detachRevision;\n\t\t\t}\n\n\t\t\treturn normalizeCellRename(baseMark.cellId, baseMark.count, originalAttach, finalDetach);\n\t\t}\n\n\t\treturn normalizeCellRename(\n\t\t\tnewAttachAndDetach.cellId,\n\t\t\tnewAttachAndDetach.count,\n\t\t\tnewAttachAndDetach.attach,\n\t\t\tnewAttachAndDetach.detach,\n\t\t);\n\t}\n\tif (isImpactfulCellRename(baseMark)) {\n\t\tconst baseAttachAndDetach = asAttachAndDetach(baseMark);\n\t\tif (markFillsCells(newMark)) {\n\t\t\tconst originalAttach = withRevision(\n\t\t\t\t{\n\t\t\t\t\t...baseAttachAndDetach.attach,\n\t\t\t\t\tcellId: baseAttachAndDetach.cellId,\n\t\t\t\t\tcount: baseAttachAndDetach.count,\n\t\t\t\t},\n\t\t\t\tbaseAttachAndDetach.attach.revision,\n\t\t\t);\n\n\t\t\tif (isMoveIn(baseAttachAndDetach.attach) && isMoveOut(baseAttachAndDetach.detach)) {\n\t\t\t\tassert(isMoveIn(newMark), 0x809 / Unexpected mark type /);\n\n\t\t\t\tconst originalAttachId = {\n\t\t\t\t\trevision: baseAttachAndDetach.attach.revision,\n\t\t\t\t\tlocalId: baseAttachAndDetach.attach.id,\n\t\t\t\t};\n\n\t\t\t\tsetTruncatedEndpointForInner(\n\t\t\t\t\tmoveEffects,\n\t\t\t\t\tCrossFieldTarget.Source,\n\t\t\t\t\tgetEndpoint(newMark),\n\t\t\t\t\tbaseAttachAndDetach.count,\n\t\t\t\t\toriginalAttachId,\n\t\t\t\t);\n\n\t\t\t\tconst newEndpoint = getComposedEndpoint(\n\t\t\t\t\tmoveEffects,\n\t\t\t\t\tCrossFieldTarget.Destination,\n\t\t\t\t\tnewMark.revision,\n\t\t\t\t\tnewMark.id,\n\t\t\t\t\tnewMark.count,\n\t\t\t\t);\n\n\t\t\t\tif (newEndpoint !== undefined) {\n\t\t\t\t\tchangeFinalEndpoint(originalAttach as MoveMarkEffect, newEndpoint);\n\t\t\t\t\tsetTruncatedEndpoint(\n\t\t\t\t\t\tmoveEffects,\n\t\t\t\t\t\tCrossFieldTarget.Source,\n\t\t\t\t\t\tnewEndpoint,\n\t\t\t\t\t\tbaseMark.count,\n\t\t\t\t\t\toriginalAttachId,\n\t\t\t\t\t);\n\t\t\t\t}\n\t\t\t}\n\n\t\t\treturn originalAttach;\n\t\t} else {\n\t\t\t// Other mark types have been handled by previous conditional branches.\n\t\t\tassert(newMark.type === NoopMarkType, 0x80a / Unexpected mark type /);\n\t\t\treturn baseMark;\n\t\t}\n\t}\n\n\tif (!markHasCellEffect(baseMark) && !markHasCellEffect(newMark)) {\n\t\treturn createNoopMark(newMark.count, undefined, getInputCellId(baseMark));\n\t} else if (!markHasCellEffect(baseMark)) {\n\t\treturn newMark;\n\t} else if (!markHasCellEffect(newMark)) {\n\t\treturn baseMark;\n\t} else if (areInputCellsEmpty(baseMark)) {\n\t\tassert(isDetach(newMark), 0x71c / Unexpected mark type /);\n\t\tassert(isAttach(baseMark), 0x71d / Expected generative mark /);\n\n\t\tconst attach = extractMarkEffect(baseMark);\n\t\tconst detach = extractMarkEffect(newMark);\n\n\t\thandleMovePivot(baseMark.count, attach, detach, moveEffects);\n\n\t\tif (areEqualCellIds(getOutputCellId(newMark), baseMark.cellId)) {\n\t\t\t// The output and input cell IDs are the same, so this mark has no effect.\n\t\t\treturn { count: baseMark.count, cellId: baseMark.cellId };\n\t\t}\n\t\treturn normalizeCellRename(baseMark.cellId, baseMark.count, attach, detach);\n\t} else {\n\t\tconst length = baseMark.count;\n\t\treturn createNoopMark(length, undefined);\n\t}\n}\n\n/\n Checks if `baseAttach` and `newDetach` are both moves, and if so updates their move endpoints as appropriate,\n * and removes their `finalEndpoint` endpoint fields. Note that can mutate `baseAttach` and `newDetach`.\n * If the effects are not both moves this function does nothing.\n * @param count - The number of cells targeted\n * @param baseAttach - The base attach effect at this location\n * @param newDetach - The new detach effect at this location\n /\nfunction handleMovePivot(\n\tcount: number,\n\tbaseAttach: Attach,\n\tnewDetach: Detach,\n\tmoveEffects: MoveEffectTable,\n): void {\n\tif (isMoveIn(baseAttach) && isMoveOut(newDetach)) {\n\t\tconst finalSource = getEndpoint(baseAttach);\n\t\tconst finalDest = getEndpoint(newDetach);\n\n\t\tsetEndpoint(moveEffects, CrossFieldTarget.Source, finalSource, count, finalDest);\n\n\t\tconst truncatedEndpoint1 = getTruncatedEndpointForInner(\n\t\t\tmoveEffects,\n\t\t\tCrossFieldTarget.Destination,\n\t\t\tbaseAttach.revision,\n\t\t\tbaseAttach.id,\n\t\t\tcount,\n\t\t);\n\n\t\tif (truncatedEndpoint1 !== undefined) {\n\t\t\tsetTruncatedEndpoint(\n\t\t\t\tmoveEffects,\n\t\t\t\tCrossFieldTarget.Destination,\n\t\t\t\tfinalDest,\n\t\t\t\tcount,\n\t\t\t\ttruncatedEndpoint1,\n\t\t\t);\n\t\t}\n\n\t\tsetEndpoint(moveEffects, CrossFieldTarget.Destination, finalDest, count, finalSource);\n\n\t\tconst truncatedEndpoint2 = getTruncatedEndpointForInner(\n\t\t\tmoveEffects,\n\t\t\tCrossFieldTarget.Source,\n\t\t\tnewDetach.revision,\n\t\t\tnewDetach.id,\n\t\t\tcount,\n\t\t);\n\n\t\tif (truncatedEndpoint2 !== undefined) {\n\t\t\tsetTruncatedEndpoint(\n\t\t\t\tmoveEffects,\n\t\t\t\tCrossFieldTarget.Source,\n\t\t\t\tfinalSource,\n\t\t\t\tcount,\n\t\t\t\ttruncatedEndpoint2,\n\t\t\t);\n\t\t}\n\n\t\t// The `finalEndpoint` field of AttachAndDetach move effect pairs is not used,\n\t\t// so we remove it as a normalization.\n\t\tdelete baseAttach.finalEndpoint;\n\t\tdelete newDetach.finalEndpoint;\n\t}\n}\n\nfunction createNoopMark(\n\tlength: number,\n\tnodeChange: NodeId \| undefined,\n\tcellId?: ChangeAtomId,\n): Mark {\n\tconst mark: CellMark<NoopMark> = { count: length };\n\tif (nodeChange !== undefined) {\n\t\tassert(length === 1, 0x692 / A mark with a node change must have length one /);\n\t\tmark.changes = nodeChange;\n\t}\n\tif (cellId !== undefined) {\n\t\tmark.cellId = cellId;\n\t}\n\treturn mark;\n}\n\nfunction handleNodeChanges(\n\tbaseMark: Mark,\n\tnewMark: Mark,\n\tcomposeChild: NodeChangeComposer,\n\tmoveEffects: MoveEffectTable,\n): NodeId \| undefined {\n\tif (newMark.changes !== undefined) {\n\t\tmoveEffects.onMoveIn(newMark.changes);\n\t\tconst baseSource = getMoveIn(baseMark);\n\n\t\t// TODO: Make sure composeChild is not called twice on the node changes.\n\t\tif (baseSource !== undefined) {\n\t\t\tsetModifyAfter(moveEffects, getEndpoint(baseSource), newMark.changes);\n\t\t\treturn undefined;\n\t\t}\n\t}\n\n\treturn composeChildChanges(baseMark.changes, newMark.changes, composeChild);\n}\n\nfunction composeChildChanges(\n\tbaseChange: NodeId \| undefined,\n\tnewChange: NodeId \| undefined,\n\tcomposeChild: NodeChangeComposer,\n): NodeId \| undefined {\n\tif (baseChange === undefined && newChange === undefined) {\n\t\treturn undefined;\n\t}\n\n\treturn composeChild(baseChange, newChange);\n}\n\nfunction composeMark<TMark extends Mark>(\n\tmark: TMark,\n\tmoveEffects: MoveEffectTable,\n\tcomposeChild: (node: NodeId) => NodeId \| undefined,\n): TMark {\n\tconst nodeChanges = mark.changes === undefined ? undefined : composeChild(mark.changes);\n\tconst updatedMark = withUpdatedEndpoint(mark, mark.count, moveEffects);\n\treturn withNodeChange(updatedMark, nodeChanges);\n}\n\nexport class ComposeQueue {\n\tprivate readonly baseMarks: MarkQueue;\n\tprivate readonly newMarks: MarkQueue;\n\tprivate readonly baseMarksCellSources: ReadonlySet<RevisionTag \| undefined>;\n\tprivate readonly newMarksCellSources: ReadonlySet<RevisionTag \| undefined>;\n\n\tpublic constructor(\n\t\tbaseMarks: Changeset,\n\t\tnewMarks: Changeset,\n\t\tprivate readonly moveEffects: MoveEffectTable,\n\t\tprivate readonly revisionMetadata: RevisionMetadataSource,\n\t) {\n\t\tthis.baseMarks = new MarkQueue(baseMarks, moveEffects);\n\t\tthis.newMarks = new MarkQueue(newMarks, moveEffects);\n\t\tthis.baseMarksCellSources = cellSourcesFromMarks(baseMarks, getOutputCellId);\n\t\tthis.newMarksCellSources = cellSourcesFromMarks(newMarks, getInputCellId);\n\t}\n\n\tpublic isEmpty(): boolean {\n\t\treturn this.baseMarks.isEmpty() && this.newMarks.isEmpty();\n\t}\n\n\tpublic pop(): ComposeMarks {\n\t\tconst baseMark = this.baseMarks.peek();\n\t\tconst newMark = this.newMarks.peek();\n\t\tif (baseMark === undefined && newMark === undefined) {\n\t\t\treturn {};\n\t\t} else if (baseMark === undefined) {\n\t\t\treturn this.dequeueNew();\n\t\t} else if (newMark === undefined) {\n\t\t\treturn this.dequeueBase();\n\t\t} else if (areOutputCellsEmpty(baseMark) && areInputCellsEmpty(newMark)) {\n\t\t\tconst baseCellId: ChangeAtomId =\n\t\t\t\tgetOutputCellId(baseMark) ?? fail(0xb29 / Expected defined output ID /);\n\n\t\t\tif (markEmptiesCells(baseMark) && baseCellId.revision === undefined) {\n\t\t\t\t// The base revision should always be defined except when squashing changes into a transaction.\n\t\t\t\t// In the future, we want to support reattaches in the new change here.\n\t\t\t\t// We will need to be able to order the base mark relative to the new mark\n\t\t\t\t// (which requires the local changes to have a revision tag))\n\t\t\t\tassert(\n\t\t\t\t\tisNewAttach(newMark),\n\t\t\t\t\t0x695 / TODO: Assign revision tags to each change in a transaction /,\n\t\t\t\t);\n\t\t\t\treturn this.dequeueNew();\n\t\t\t}\n\n\t\t\tconst newCellId = getInputCellId(newMark);\n\t\t\tassert(newCellId !== undefined, 0x89d / Both marks should have cell IDs /);\n\t\t\tconst comparison = compareCellPositionsUsingTombstones(\n\t\t\t\tbaseCellId,\n\t\t\t\tnewCellId,\n\t\t\t\tthis.baseMarksCellSources,\n\t\t\t\tthis.newMarksCellSources,\n\t\t\t\tthis.revisionMetadata,\n\t\t\t);\n\t\t\tswitch (comparison) {\n\t\t\t\tcase CellOrder.SameCell: {\n\t\t\t\t\treturn this.dequeueBoth();\n\t\t\t\t}\n\t\t\t\tcase CellOrder.OldThenNew: {\n\t\t\t\t\treturn this.dequeueBase();\n\t\t\t\t}\n\t\t\t\tcase CellOrder.NewThenOld: {\n\t\t\t\t\treturn this.dequeueNew();\n\t\t\t\t}\n\t\t\t\tdefault: {\n\t\t\t\t\tunreachableCase(comparison);\n\t\t\t\t}\n\t\t\t}\n\t\t} else if (areOutputCellsEmpty(baseMark)) {\n\t\t\treturn this.dequeueBase();\n\t\t} else if (areInputCellsEmpty(newMark)) {\n\t\t\treturn this.dequeueNew();\n\t\t} else {\n\t\t\treturn this.dequeueBoth();\n\t\t}\n\t}\n\n\tprivate dequeueBase(length: number = Number.POSITIVE_INFINITY): ComposeMarks {\n\t\tconst baseMark = this.baseMarks.dequeueUpTo(length);\n\t\tconst movedChanges = getMovedChangesFromMark(this.moveEffects, baseMark);\n\t\tconst newMark = createNoopMark(baseMark.count, movedChanges, getOutputCellId(baseMark));\n\t\treturn { baseMark, newMark };\n\t}\n\n\tprivate dequeueNew(length: number = Number.POSITIVE_INFINITY): ComposeMarks {\n\t\tconst newMark = this.newMarks.dequeueUpTo(length);\n\t\tconst baseMark = createNoopMark(newMark.count, undefined, getInputCellId(newMark));\n\n\t\treturn {\n\t\t\tbaseMark,\n\t\t\tnewMark,\n\t\t};\n\t}\n\n\tprivate dequeueBoth(): ComposeMarks {\n\t\tconst length = this.peekMinLength();\n\t\tconst baseMark = this.baseMarks.dequeueUpTo(length);\n\t\tlet newMark = this.newMarks.dequeueUpTo(length);\n\t\tconst movedChanges = getMovedChangesFromMark(this.moveEffects, baseMark);\n\n\t\tif (movedChanges !== undefined) {\n\t\t\tassert(newMark.changes === undefined, 0x8da / Unexpected node changeset collision /);\n\t\t\tnewMark = withNodeChange(newMark, movedChanges);\n\t\t}\n\n\t\treturn {\n\t\t\tbaseMark,\n\t\t\tnewMark,\n\t\t};\n\t}\n\n\tprivate peekMinLength(): number {\n\t\tconst baseMark = this.baseMarks.peek();\n\t\tconst newMark = this.newMarks.peek();\n\t\tassert(\n\t\t\tbaseMark !== undefined && newMark !== undefined,\n\t\t\t0x8db / Cannot peek length unless both mark queues are non-empty /,\n\t\t);\n\n\t\treturn Math.min(newMark.count, baseMark.count);\n\t}\n}\n\ninterface ComposeMarks {\n\tbaseMark?: Mark;\n\tnewMark?: Mark;\n}\n\nfunction getMovedChangesFromMark(\n\tmoveEffects: MoveEffectTable,\n\tmarkEffect: MarkEffect,\n): NodeId \| undefined {\n\tif (isAttachAndDetachEffect(markEffect)) {\n\t\treturn getMovedChangesFromMark(moveEffects, markEffect.detach);\n\t}\n\tif (!isMoveOut(markEffect)) {\n\t\treturn undefined;\n\t}\n\n\treturn getModifyAfter(moveEffects, markEffect.revision, markEffect.id);\n}\n\n// It is expected that the range from `id` to `id + count - 1` has the same move effect.\n// The call sites to this function are making queries about a mark which has already been split by a `MarkQueue`\n// to match the ranges in `moveEffects`.\n// TODO: Reduce the duplication between this and other MoveEffect helpers\nfunction getModifyAfter(\n\tmoveEffects: MoveEffectTable,\n\trevision: RevisionTag \| undefined,\n\tid: MoveId,\n): NodeId \| undefined {\n\tconst target = CrossFieldTarget.Source;\n\tconst effect = getMoveEffect(moveEffects, target, revision, id, 1);\n\n\tif (effect.value?.modifyAfter !== undefined) {\n\t\treturn effect.value.modifyAfter;\n\t}\n\n\treturn undefined;\n}\n\n// TODO: Reduce the duplication between this and other MoveEffect helpers\nfunction setModifyAfter(\n\tmoveEffects: MoveEffectTable,\n\t{ revision, localId: id }: ChangeAtomId,\n\tmodifyAfter: NodeId,\n): void {\n\tconst target = CrossFieldTarget.Source;\n\tconst count = 1;\n\tconst effect = getMoveEffect(moveEffects, target, revision, id, count, false);\n\tconst newEffect: MoveEffect =\n\t\teffect.value === undefined ? { modifyAfter } : { ...effect.value, modifyAfter };\n\tsetMoveEffect(moveEffects, target, revision, id, count, newEffect);\n}\n\nfunction setEndpoint(\n\tmoveEffects: MoveEffectTable,\n\ttarget: CrossFieldTarget,\n\tid: ChangeAtomId,\n\tcount: number,\n\tendpoint: ChangeAtomId,\n): void {\n\tconst effect = getMoveEffect(moveEffects, target, id.revision, id.localId, count, false);\n\tconst newEffect = effect.value === undefined ? { endpoint } : { ...effect.value, endpoint };\n\tsetMoveEffect(moveEffects, target, id.revision, id.localId, effect.length, newEffect);\n\n\tconst remainingCount = count - effect.length;\n\tif (remainingCount > 0) {\n\t\tsetEndpoint(\n\t\t\tmoveEffects,\n\t\t\ttarget,\n\t\t\toffsetChangeAtomId(id, effect.length),\n\t\t\tremainingCount,\n\t\t\toffsetChangeAtomId(endpoint, effect.length),\n\t\t);\n\t}\n}\n\nfunction setTruncatedEndpoint(\n\tmoveEffects: MoveEffectTable,\n\ttarget: CrossFieldTarget,\n\tid: ChangeAtomId,\n\tcount: number,\n\ttruncatedEndpoint: ChangeAtomId,\n): void {\n\tconst effect = getMoveEffect(moveEffects, target, id.revision, id.localId, count);\n\tconst newEffect =\n\t\teffect.value === undefined\n\t\t\t? { truncatedEndpoint }\n\t\t\t: { ...effect.value, truncatedEndpoint };\n\n\tsetMoveEffect(moveEffects, target, id.revision, id.localId, effect.length, newEffect);\n\n\tconst remainingCount = count - effect.length;\n\tif (remainingCount > 0) {\n\t\tsetTruncatedEndpoint(\n\t\t\tmoveEffects,\n\t\t\ttarget,\n\t\t\toffsetChangeAtomId(id, effect.length),\n\t\t\tremainingCount,\n\t\t\toffsetChangeAtomId(truncatedEndpoint, effect.length),\n\t\t);\n\t}\n}\n\nfunction setTruncatedEndpointForInner(\n\tmoveEffects: MoveEffectTable,\n\ttarget: CrossFieldTarget,\n\tid: ChangeAtomId,\n\tcount: number,\n\ttruncatedEndpointForInner: ChangeAtomId,\n): void {\n\tconst effect = getMoveEffect(moveEffects, target, id.revision, id.localId, count);\n\tconst newEffect =\n\t\teffect.value === undefined\n\t\t\t? { truncatedEndpointForInner }\n\t\t\t: { ...effect.value, truncatedEndpointForInner };\n\tsetMoveEffect(moveEffects, target, id.revision, id.localId, effect.length, newEffect);\n\n\tconst remainingCount = count - effect.length;\n\tif (remainingCount > 0) {\n\t\tsetTruncatedEndpointForInner(\n\t\t\tmoveEffects,\n\t\t\ttarget,\n\t\t\toffsetChangeAtomId(id, effect.length),\n\t\t\tremainingCount,\n\t\t\toffsetChangeAtomId(truncatedEndpointForInner, effect.length),\n\t\t);\n\t}\n}\n\nfunction withUpdatedEndpoint<TMark extends MarkEffect>(\n\tmark: TMark,\n\tcount: number,\n\teffects: MoveEffectTable,\n): TMark {\n\tif (isAttachAndDetachEffect(mark)) {\n\t\treturn {\n\t\t\t...mark,\n\t\t\tattach: withUpdatedEndpoint(mark.attach, count, effects),\n\t\t\tdetach: withUpdatedEndpoint(mark.detach, count, effects),\n\t\t};\n\t}\n\n\tif (!isMoveMark(mark)) {\n\t\treturn mark;\n\t}\n\tconst finalDest = getComposedEndpoint(\n\t\teffects,\n\t\tgetCrossFieldTargetFromMove(mark),\n\t\tmark.revision,\n\t\tmark.id,\n\t\tcount,\n\t);\n\n\tif (finalDest === undefined) {\n\t\treturn mark;\n\t}\n\n\tconst output = { ...mark };\n\tchangeFinalEndpoint(output, finalDest);\n\n\treturn output;\n}\n\nfunction changeFinalEndpoint(mark: MoveMarkEffect, endpoint: ChangeAtomId): void {\n\tif (areEqualCellIds(endpoint, { revision: mark.revision, localId: mark.id })) {\n\t\tdelete mark.finalEndpoint;\n\t} else {\n\t\tmark.finalEndpoint = endpoint;\n\t}\n}\n\nfunction getComposedEndpoint(\n\tmoveEffects: MoveEffectTable,\n\ttarget: CrossFieldTarget,\n\trevision: RevisionTag \| undefined,\n\tid: MoveId,\n\tcount: number,\n): ChangeAtomId \| undefined {\n\tconst effect = getMoveEffect(moveEffects, target, revision, id, count);\n\tassert(effect.length === count, 0x815 / Expected effect to cover entire mark /);\n\treturn effect.value?.truncatedEndpoint ?? effect.value?.endpoint;\n}\n\nfunction getTruncatedEndpointForInner(\n\tmoveEffects: MoveEffectTable,\n\ttarget: CrossFieldTarget,\n\trevision: RevisionTag \| undefined,\n\tid: MoveId,\n\tcount: number,\n): ChangeAtomId \| undefined {\n\tconst effect = getMoveEffect(moveEffects, target, revision, id, count);\n\tassert(effect.length === count, 0x934 / Expected effect to cover entire mark */);\n\treturn effect.value?.truncatedEndpointForInner;\n}\n"]}

package/lib/feature-libraries/sequence-field/filterEdits.d.ts CHANGED Viewed

@@ -2,11 +2,11 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { type EditFilterFunc } from "../modular-schema/index.js";
+import { type FilterAttachFunc, type FilterDetachFunc } from "../modular-schema/index.js";
 import { type Changeset } from "./types.js";
 export declare function filterEdits(change: Changeset, options: {
-    filterDetach: EditFilterFunc;
-    filterAttach: EditFilterFunc;
+    filterDetach: FilterDetachFunc;
+    filterAttach: FilterAttachFunc;
     preserveOtherEdits: boolean;
 }): Changeset;
 //# sourceMappingURL=filterEdits.d.ts.map

package/lib/feature-libraries/sequence-field/filterEdits.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"filterEdits.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/filterEdits.ts"],"names":[],"mappings":"AAAA;;;GAGG;~~AAIH~~,OAAO,~~EAAoB~~,KAAK,~~cAAc~~,~~EAAE~~,MAAM,4BAA4B,CAAC;~~AAEnF~~,OAAO,EAAgB,KAAK,SAAS,EAAa,MAAM,YAAY,CAAC;~~AAKrE~~,wBAAgB,WAAW,CAC1B,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE;IACR,YAAY,EAAE,~~cAAc~~,CAAC;~~IAC7B~~,YAAY,EAAE,~~cAAc~~,CAAC;~~IAC7B~~,kBAAkB,EAAE,OAAO,CAAC;CAC5B,GACC,SAAS,CAeX"}
1	+ {"version":3,"file":"filterEdits.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/filterEdits.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAEN,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAgB,KAAK,SAAS,EAAa,MAAM,YAAY,CAAC;AAUrE,wBAAgB,WAAW,CAC1B,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE;IACR,YAAY,EAAE,gBAAgB,CAAC;IAC/B,YAAY,EAAE,gBAAgB,CAAC;IAC/B,kBAAkB,EAAE,OAAO,CAAC;CAC5B,GACC,SAAS,CAeX"}

package/lib/feature-libraries/sequence-field/filterEdits.js CHANGED Viewed

@@ -2,12 +2,12 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { EditFilterStatus } from "../modular-schema/index.js";
+import { EditFilterStatus, } from "../modular-schema/index.js";
 import { MarkListFactory } from "./markListFactory.js";
 import { NoopMarkType } from "./types.js";
-import { getDetachedNodeId, getDetachOutputCellId, omitMarkEffect } from "./utils.js";
+import { getDetachedNodeId, getDetachOutputCellId, getOutputCellId, omitMarkEffect, } from "./utils.js";
 import { MarkQueueBase } from "./markQueue.js";
-import { unreachableCase } from "@fluidframework/core-utils/internal";
+import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
 export function filterEdits(change, options) {
     const factory = new MarkListFactory();
     const queue = new MarkQueueBase(change);
@@ -26,10 +26,11 @@ function filterMark(mark, filterDetach, filterAttach, preserveOtherEdits) {
             if (mark.cellId === undefined) {
                 return preserveOtherEdits ? mark : omitMarkEffect(mark);
             }
+            const attachId = mark.type === "MoveIn" ? { revision: mark.revision, localId: mark.id } : mark.cellId;
             const endpoint = mark.type === "MoveIn" ? mark.finalEndpoint : undefined;
-            const result = filterAttach(mark.cellId, mark.count, endpoint);
+            const result = filterAttach(attachId, mark.count, undefined, endpoint);
             let filtered;
-            switch (result.value) {
+            switch (result.value.action) {
                 case EditFilterStatus.Preserve: {
                     filtered = mark;
                     break;
@@ -40,7 +41,11 @@ function filterMark(mark, filterDetach, filterAttach, preserveOtherEdits) {
                     // Insert marks use the cell ID as the attach ID, so we must change the cell ID here.
                     // This could be a problem if there were references to the old cell ID outside this changeset,
                     // but PreserveWithoutMove is only used for transaction minimization, where that is not a problem.
-                    const newCellId = endpoint ?? { revision: mark.revision, localId: mark.id };
+                    const newCellId = result.value.newAttachId ??
+                        endpoint ?? {
+                        revision: mark.revision,
+                        localId: mark.id,
+                    };
                     filtered = {
                         type: "Insert",
                         count: result.length,
@@ -48,6 +53,9 @@ function filterMark(mark, filterDetach, filterAttach, preserveOtherEdits) {
                         revision: mark.revision,
                         id: mark.id,
                     };
+                    if (result.value.nodeId !== undefined) {
+                        filtered.changes = result.value.nodeId;
+                    }
                     break;
                 }
                 case EditFilterStatus.Remove: {
@@ -55,7 +63,7 @@ function filterMark(mark, filterDetach, filterAttach, preserveOtherEdits) {
                     break;
                 }
                 default: {
-                    unreachableCase(result.value);
+                    unreachableCase(result.value.action);
                 }
             }
             return { ...filtered, count: result.length };
@@ -64,9 +72,9 @@ function filterMark(mark, filterDetach, filterAttach, preserveOtherEdits) {
         case "MoveOut": {
             const detachId = getDetachedNodeId(mark);
             const endpoint = mark.type === "MoveOut" ? mark.finalEndpoint : undefined;
-            const result = filterDetach(detachId, mark.count, endpoint);
+            const result = filterDetach(detachId, mark.count, mark.cellId, endpoint);
             let filtered;
-            switch (result.value) {
+            switch (result.value.action) {
                 case EditFilterStatus.Preserve: {
                     filtered = mark;
                     break;
@@ -86,17 +94,28 @@ function filterMark(mark, filterDetach, filterAttach, preserveOtherEdits) {
                 }
                 case EditFilterStatus.Remove: {
                     filtered = omitMarkEffect(mark);
+                    if (result.value.shouldRemoveChild === true) {
+                        delete filtered.changes;
+                    }
                     break;
                 }
                 default: {
-                    unreachableCase(result.value);
+                    unreachableCase(result.value.action);
                 }
             }
             return { ...filtered, count: result.length };
         }
-        case NoopMarkType:
-        case "Rename":
         case "AttachAndDetach": {
+            assert(mark.attach.type === "MoveIn", 0xd3c /* AttachAndDetach marks in changesets should always represent MoveIn + Remove */);
+            if (mark.cellId === undefined) {
+                return preserveOtherEdits ? mark : omitMarkEffect(mark);
+            }
+            const result = filterAttach({ revision: mark.attach.revision, localId: mark.attach.id }, mark.count, getOutputCellId(mark), mark.attach.finalEndpoint);
+            const filtered = result.value.action === EditFilterStatus.Preserve ? mark : omitMarkEffect(mark);
+            return { ...filtered, count: result.length };
+        }
+        case NoopMarkType:
+        case "Rename": {
             return preserveOtherEdits ? mark : omitMarkEffect(mark);
         }
         default: {

package/lib/feature-libraries/sequence-field/filterEdits.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"filterEdits.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/filterEdits.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 type { ChangeAtomId } from \"../../core/index.js\";\nimport type { RangeQueryResult } from \"../../util/index.js\";\nimport { EditFilterStatus, type EditFilterFunc } from \"../modular-schema/index.js\";\nimport { MarkListFactory } from \"./markListFactory.js\";\nimport { NoopMarkType, type Changeset, type Mark } from \"./types.js\";\nimport { getDetachedNodeId, getDetachOutputCellId, omitMarkEffect } from \"./utils.js\";\nimport { MarkQueueBase } from \"./markQueue.js\";\nimport { unreachableCase } from \"@fluidframework/core-utils/internal\";\n\nexport function filterEdits(\n\tchange: Changeset,\n\toptions: {\n\t\tfilterDetach: EditFilterFunc;\n\t\tfilterAttach: EditFilterFunc;\n\t\tpreserveOtherEdits: boolean;\n\t},\n): Changeset {\n\tconst factory = new MarkListFactory();\n\tconst queue = new MarkQueueBase(change);\n\tfor (let mark = queue.peek(); mark !== undefined; mark = queue.peek()) {\n\t\tconst filtered = filterMark(\n\t\t\tmark,\n\t\t\toptions.filterDetach,\n\t\t\toptions.filterAttach,\n\t\t\toptions.preserveOtherEdits,\n\t\t);\n\t\tfactory.push(filtered);\n\t\tqueue.dequeueUpTo(filtered.count);\n\t}\n\n\treturn factory.list;\n}\n\nfunction filterMark(\n\tmark: Mark,\n\tfilterDetach: (\n\t\tid: ChangeAtomId,\n\t\tcount: number,\n\t\tendpoint?: ChangeAtomId,\n\t) => RangeQueryResult<EditFilterStatus>,\n\tfilterAttach: (\n\t\tid: ChangeAtomId,\n\t\tcount: number,\n\t\tendpoint?: ChangeAtomId,\n\t) => RangeQueryResult<EditFilterStatus>,\n\tpreserveOtherEdits: boolean,\n): Mark {\n\tconst type = mark.type;\n\tswitch (type) {\n\t\tcase \"Insert\":\n\t\tcase \"MoveIn\": {\n\t\t\tif (mark.cellId === undefined) {\n\t\t\t\treturn preserveOtherEdits ? mark : omitMarkEffect(mark);\n\t\t\t}\n\n\t\t\tconst endpoint = mark.type === \"MoveIn\" ? mark.finalEndpoint : undefined;\n\t\t\tconst result = filterAttach(mark.cellId, mark.count, endpoint);\n\n\t\t\tlet filtered: Mark;\n\t\t\tswitch (result.value) {\n\t\t\t\tcase EditFilterStatus.Preserve: {\n\t\t\t\t\tfiltered = mark;\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tcase EditFilterStatus.PreserveWithoutMove: {\n\t\t\t\t\t// KLUDGE: PreserveWithoutMove requires us to return a mark which attaches the node\n\t\t\t\t\t// using the detach ID of the move (the endpoint ID).\n\t\t\t\t\t// Insert marks use the cell ID as the attach ID, so we must change the cell ID here.\n\t\t\t\t\t// This could be a problem if there were references to the old cell ID outside this changeset,\n\t\t\t\t\t// but PreserveWithoutMove is only used for transaction minimization, where that is not a problem.\n\t\t\t\t\tconst newCellId = endpoint ?? { revision: mark.revision, localId: mark.id };\n\t\t\t\t\tfiltered = {\n\t\t\t\t\t\ttype: \"Insert\",\n\t\t\t\t\t\tcount: result.length,\n\t\t\t\t\t\tcellId: newCellId,\n\t\t\t\t\t\trevision: mark.revision,\n\t\t\t\t\t\tid: mark.id,\n\t\t\t\t\t};\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tcase EditFilterStatus.Remove: {\n\t\t\t\t\tfiltered = omitMarkEffect(mark);\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tdefault: {\n\t\t\t\t\tunreachableCase(result.value);\n\t\t\t\t}\n\t\t\t}\n\n\t\t\treturn { ...filtered, count: result.length };\n\t\t}\n\t\tcase \"Remove\":\n\t\tcase \"MoveOut\": {\n\t\t\tconst detachId = getDetachedNodeId(mark);\n\t\t\tconst endpoint = mark.type === \"MoveOut\" ? mark.finalEndpoint : undefined;\n\t\t\tconst result = filterDetach(detachId, mark.count, endpoint);\n\n\t\t\tlet filtered: Mark;\n\t\t\tswitch (result.value) {\n\t\t\t\tcase EditFilterStatus.Preserve: {\n\t\t\t\t\tfiltered = mark;\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tcase EditFilterStatus.PreserveWithoutMove: {\n\t\t\t\t\tconst outputCellId = getDetachOutputCellId(mark);\n\t\t\t\t\tfiltered = {\n\t\t\t\t\t\ttype: \"Remove\",\n\t\t\t\t\t\tcount: mark.count,\n\t\t\t\t\t\trevision: outputCellId.revision,\n\t\t\t\t\t\tid: outputCellId.localId,\n\t\t\t\t\t};\n\n\t\t\t\t\tif (mark.changes !== undefined) {\n\t\t\t\t\t\tfiltered.changes = mark.changes;\n\t\t\t\t\t}\n\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tcase EditFilterStatus.Remove: {\n\t\t\t\t\tfiltered = omitMarkEffect(mark);\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tdefault: {\n\t\t\t\t\tunreachableCase(result.value);\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn { ...filtered, count: result.length };\n\t\t}\n\t\tcase NoopMarkType:\n\t\tcase \"Rename\":\n\t\tcase \"AttachAndDetach\": {\n\t\t\treturn preserveOtherEdits ? mark : omitMarkEffect(mark);\n\t\t}\n\t\tdefault: {\n\t\t\tunreachableCase(type);\n\t\t}\n\t}\n}\n"]}
1	+ {"version":3,"file":"filterEdits.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/filterEdits.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 {\n\tEditFilterStatus,\n\ttype FilterAttachFunc,\n\ttype FilterDetachFunc,\n} from \"../modular-schema/index.js\";\nimport { MarkListFactory } from \"./markListFactory.js\";\nimport { NoopMarkType, type Changeset, type Mark } from \"./types.js\";\nimport {\n\tgetDetachedNodeId,\n\tgetDetachOutputCellId,\n\tgetOutputCellId,\n\tomitMarkEffect,\n} from \"./utils.js\";\nimport { MarkQueueBase } from \"./markQueue.js\";\nimport { assert, unreachableCase } from \"@fluidframework/core-utils/internal\";\n\nexport function filterEdits(\n\tchange: Changeset,\n\toptions: {\n\t\tfilterDetach: FilterDetachFunc;\n\t\tfilterAttach: FilterAttachFunc;\n\t\tpreserveOtherEdits: boolean;\n\t},\n): Changeset {\n\tconst factory = new MarkListFactory();\n\tconst queue = new MarkQueueBase(change);\n\tfor (let mark = queue.peek(); mark !== undefined; mark = queue.peek()) {\n\t\tconst filtered = filterMark(\n\t\t\tmark,\n\t\t\toptions.filterDetach,\n\t\t\toptions.filterAttach,\n\t\t\toptions.preserveOtherEdits,\n\t\t);\n\t\tfactory.push(filtered);\n\t\tqueue.dequeueUpTo(filtered.count);\n\t}\n\n\treturn factory.list;\n}\n\nfunction filterMark(\n\tmark: Mark,\n\tfilterDetach: FilterDetachFunc,\n\tfilterAttach: FilterAttachFunc,\n\tpreserveOtherEdits: boolean,\n): Mark {\n\tconst type = mark.type;\n\tswitch (type) {\n\t\tcase \"Insert\":\n\t\tcase \"MoveIn\": {\n\t\t\tif (mark.cellId === undefined) {\n\t\t\t\treturn preserveOtherEdits ? mark : omitMarkEffect(mark);\n\t\t\t}\n\n\t\t\tconst attachId =\n\t\t\t\tmark.type === \"MoveIn\" ? { revision: mark.revision, localId: mark.id } : mark.cellId;\n\n\t\t\tconst endpoint = mark.type === \"MoveIn\" ? mark.finalEndpoint : undefined;\n\t\t\tconst result = filterAttach(attachId, mark.count, undefined, endpoint);\n\n\t\t\tlet filtered: Mark;\n\t\t\tswitch (result.value.action) {\n\t\t\t\tcase EditFilterStatus.Preserve: {\n\t\t\t\t\tfiltered = mark;\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tcase EditFilterStatus.PreserveWithoutMove: {\n\t\t\t\t\t// KLUDGE: PreserveWithoutMove requires us to return a mark which attaches the node\n\t\t\t\t\t// using the detach ID of the move (the endpoint ID).\n\t\t\t\t\t// Insert marks use the cell ID as the attach ID, so we must change the cell ID here.\n\t\t\t\t\t// This could be a problem if there were references to the old cell ID outside this changeset,\n\t\t\t\t\t// but PreserveWithoutMove is only used for transaction minimization, where that is not a problem.\n\t\t\t\t\tconst newCellId = result.value.newAttachId ??\n\t\t\t\t\t\tendpoint ?? {\n\t\t\t\t\t\t\trevision: mark.revision,\n\t\t\t\t\t\t\tlocalId: mark.id,\n\t\t\t\t\t\t};\n\t\t\t\t\tfiltered = {\n\t\t\t\t\t\ttype: \"Insert\",\n\t\t\t\t\t\tcount: result.length,\n\t\t\t\t\t\tcellId: newCellId,\n\t\t\t\t\t\trevision: mark.revision,\n\t\t\t\t\t\tid: mark.id,\n\t\t\t\t\t};\n\n\t\t\t\t\tif (result.value.nodeId !== undefined) {\n\t\t\t\t\t\tfiltered.changes = result.value.nodeId;\n\t\t\t\t\t}\n\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tcase EditFilterStatus.Remove: {\n\t\t\t\t\tfiltered = omitMarkEffect(mark);\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tdefault: {\n\t\t\t\t\tunreachableCase(result.value.action);\n\t\t\t\t}\n\t\t\t}\n\n\t\t\treturn { ...filtered, count: result.length };\n\t\t}\n\t\tcase \"Remove\":\n\t\tcase \"MoveOut\": {\n\t\t\tconst detachId = getDetachedNodeId(mark);\n\t\t\tconst endpoint = mark.type === \"MoveOut\" ? mark.finalEndpoint : undefined;\n\t\t\tconst result = filterDetach(detachId, mark.count, mark.cellId, endpoint);\n\n\t\t\tlet filtered: Mark;\n\t\t\tswitch (result.value.action) {\n\t\t\t\tcase EditFilterStatus.Preserve: {\n\t\t\t\t\tfiltered = mark;\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tcase EditFilterStatus.PreserveWithoutMove: {\n\t\t\t\t\tconst outputCellId = getDetachOutputCellId(mark);\n\t\t\t\t\tfiltered = {\n\t\t\t\t\t\ttype: \"Remove\",\n\t\t\t\t\t\tcount: mark.count,\n\t\t\t\t\t\trevision: outputCellId.revision,\n\t\t\t\t\t\tid: outputCellId.localId,\n\t\t\t\t\t};\n\n\t\t\t\t\tif (mark.changes !== undefined) {\n\t\t\t\t\t\tfiltered.changes = mark.changes;\n\t\t\t\t\t}\n\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tcase EditFilterStatus.Remove: {\n\t\t\t\t\tfiltered = omitMarkEffect(mark);\n\t\t\t\t\tif (result.value.shouldRemoveChild === true) {\n\t\t\t\t\t\tdelete filtered.changes;\n\t\t\t\t\t}\n\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tdefault: {\n\t\t\t\t\tunreachableCase(result.value.action);\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn { ...filtered, count: result.length };\n\t\t}\n\t\tcase \"AttachAndDetach\": {\n\t\t\tassert(\n\t\t\t\tmark.attach.type === \"MoveIn\",\n\t\t\t\t0xd3c / AttachAndDetach marks in changesets should always represent MoveIn + Remove */,\n\t\t\t);\n\n\t\t\tif (mark.cellId === undefined) {\n\t\t\t\treturn preserveOtherEdits ? mark : omitMarkEffect(mark);\n\t\t\t}\n\n\t\t\tconst result = filterAttach(\n\t\t\t\t{ revision: mark.attach.revision, localId: mark.attach.id },\n\t\t\t\tmark.count,\n\t\t\t\tgetOutputCellId(mark),\n\t\t\t\tmark.attach.finalEndpoint,\n\t\t\t);\n\n\t\t\tconst filtered =\n\t\t\t\tresult.value.action === EditFilterStatus.Preserve ? mark : omitMarkEffect(mark);\n\n\t\t\treturn { ...filtered, count: result.length };\n\t\t}\n\t\tcase NoopMarkType:\n\t\tcase \"Rename\": {\n\t\t\treturn preserveOtherEdits ? mark : omitMarkEffect(mark);\n\t\t}\n\t\tdefault: {\n\t\t\tunreachableCase(type);\n\t\t}\n\t}\n}\n"]}

package/lib/feature-libraries/sequence-field/formatV1.d.ts CHANGED Viewed

@@ -221,7 +221,7 @@ declare const MarkEffect: Type.TObject<{
         }>;
     }>>;
 }>;
-declare const CellMark: <TMark extends Type.TSchema, TNodeChange extends Type.TSchema>(tMark: TMark, tNodeChange: TNodeChange) => Type.TObject<{
+declare const CellMark: <TMark extends TSchema, TNodeChange extends TSchema>(tMark: TMark, tNodeChange: TNodeChange) => Type.TObject<{
     effect: TMark extends Type.TOptional<infer S extends Type.TSchema> ? Type.TOptional<S> : Type.Ensure<Type.TOptional<TMark>>;
     cellId: Type.TOptional<Type.TObject<{
         lineage: Type.TOptional<Type.TArray<Type.TTuple<[Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>, Type.TUnsafe<import("../../core/index.js").ChangesetLocalId>, Type.TNumber, Type.TNumber]>>>;
@@ -231,7 +231,7 @@ declare const CellMark: <TMark extends Type.TSchema, TNodeChange extends Type.TS
     changes: TNodeChange extends Type.TOptional<infer S extends Type.TSchema> ? Type.TOptional<S> : Type.Ensure<Type.TOptional<TNodeChange>>;
     count: Type.TNumber;
 }>;
-declare const Mark: <Schema extends Type.TSchema>(tNodeChange: Schema) => Type.TObject<{
+declare const Mark: <Schema extends TSchema>(tNodeChange: Schema) => Type.TObject<{
     effect: Type.TOptional<Type.TObject<{
         insert: Type.TOptional<Type.TObject<{
             id: Type.TUnsafe<import("../../core/index.js").ChangesetLocalId>;
@@ -316,7 +316,7 @@ declare const Mark: <Schema extends Type.TSchema>(tNodeChange: Schema) => Type.T
     changes: Schema extends Type.TOptional<infer S extends Type.TSchema> ? Type.TOptional<S> : Type.Ensure<Type.TOptional<Schema>>;
     count: Type.TNumber;
 }>;
-export declare const Changeset: <Schema extends Type.TSchema>(tNodeChange: Schema) => Type.TArray<Type.TObject<{
+export declare const Changeset: <Schema extends TSchema>(tNodeChange: Schema) => Type.TArray<Type.TObject<{
     effect: Type.TOptional<Type.TObject<{
         insert: Type.TOptional<Type.TObject<{
             id: Type.TUnsafe<import("../../core/index.js").ChangesetLocalId>;

package/lib/feature-libraries/sequence-field/formatV1.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"formatV1.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/formatV1.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAC;AAC1C,OAAO,KAAK,EAAiB,MAAM,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAMxE,oBAAY,oBAAoB;IAC/B;;;;;;OAMG;IACH,QAAQ,IAAI;IACZ;;;;;;;;OAQG;IACH,QAAQ,IAAI;CACZ;AAID,QAAA,MAAM,SAAS,cAA6C,CAAC;AAE7D,QAAA,MAAM,MAAM,8DAAyB,CAAC;AAGtC,QAAA,MAAM,YAAY,qRAOhB,CAAC;AAIH,QAAA,MAAM,OAAO,2FAAkD,CAAC;AAEhE,QAAA,MAAM,MAAM;;;;EASX,CAAC;AAIF,QAAA,MAAM,MAAM;;;EAAiE,CAAC;AAQ9E,QAAA,MAAM,MAAM;;;;EAAqD,CAAC;AAclE,QAAA,MAAM,MAAM;;;;;;;;;;;EASX,CAAC;AAEF,QAAA,MAAM,OAAO;;;;;;;;;;;;EAAmE,CAAC;AAEjF,QAAA,MAAM,MAAM;;;;;;;;;;EAMX,CAAC;AAEF,QAAA,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;EAOX,CAAC;AAEF,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGnB,CAAC;AAEH,QAAA,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAWf,CAAC;AAEF,QAAA,MAAM,QAAQ;;;;;;;;;~~EAeZ~~,CAAC;AAIH,QAAA,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;~~EACwB~~,CAAC;AAInC,eAAO,MAAM,SAAS,~~6CAAyC~~,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GACvC,CAAC;AAE/B;;GAEG;AACH,yBAAiB,OAAO,CAAC;IACxB,KAAY,SAAS,GAAG,MAAM,CAAC,OAAO,SAAS,CAAC,CAAC;IAEjD,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,MAAM,CAAC,OAAO,YAAY,CAAC,CAAC;IACvD,KAAY,OAAO,GAAG,MAAM,CAAC,OAAO,OAAO,CAAC,CAAC;IAE7C,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAE3C,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,KAAY,OAAO,GAAG,MAAM,CAAC,OAAO,OAAO,CAAC,CAAC;IAC7C,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,KAAY,eAAe,GAAG,MAAM,CAAC,OAAO,eAAe,CAAC,CAAC;IAC7D,KAAY,UAAU,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC;IAEnD,KAAY,QAAQ,CAAC,MAAM,SAAS,OAAO,EAAE,WAAW,SAAS,OAAO,IAAI,MAAM,CACjF,UAAU,CAAC,OAAO,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAChD,CAAC;IACF,KAAY,IAAI,CAAC,MAAM,SAAS,OAAO,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACnF,KAAY,SAAS,CAAC,MAAM,SAAS,OAAO,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;CAC7F"}
1	+ {"version":3,"file":"formatV1.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/formatV1.ts"],"names":[],"mappings":"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"}

package/lib/feature-libraries/sequence-field/formatV2.d.ts CHANGED Viewed

@@ -126,13 +126,13 @@ export declare const MarkEffect: Type.TObject<{
         }>;
     }>>;
 }>;
-export declare const CellMark: <TMark extends Type.TSchema, TNodeChange extends Type.TSchema>(tMark: TMark, tNodeChange: TNodeChange) => Type.TObject<{
+export declare const CellMark: <TMark extends TSchema, TNodeChange extends TSchema>(tMark: TMark, tNodeChange: TNodeChange) => Type.TObject<{
     effect: TMark extends Type.TOptional<infer S extends Type.TSchema> ? Type.TOptional<S> : Type.Ensure<Type.TOptional<TMark>>;
     cellId: Type.TOptional<Type.TUnion<[Type.TTuple<[Type.TUnsafe<import("../../core/index.js").ChangesetLocalId>, Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, Type.TUnsafe<import("../../core/index.js").ChangesetLocalId>]>>;
     changes: TNodeChange extends Type.TOptional<infer S extends Type.TSchema> ? Type.TOptional<S> : Type.Ensure<Type.TOptional<TNodeChange>>;
     count: Type.TNumber;
 }>;
-declare const Mark: <Schema extends Type.TSchema>(tNodeChange: Schema) => Type.TObject<{
+declare const Mark: <Schema extends TSchema>(tNodeChange: Schema) => Type.TObject<{
     effect: Type.TOptional<Type.TObject<{
         insert: Type.TOptional<Type.TObject<{
             id: Type.TUnsafe<import("../../core/index.js").ChangesetLocalId>;
@@ -185,7 +185,7 @@ declare const Mark: <Schema extends Type.TSchema>(tNodeChange: Schema) => Type.T
     changes: Schema extends Type.TOptional<infer S extends Type.TSchema> ? Type.TOptional<S> : Type.Ensure<Type.TOptional<Schema>>;
     count: Type.TNumber;
 }>;
-export declare const Changeset: <Schema extends Type.TSchema>(tNodeChange: Schema) => Type.TArray<Type.TObject<{
+export declare const Changeset: <Schema extends TSchema>(tNodeChange: Schema) => Type.TArray<Type.TObject<{
     effect: Type.TOptional<Type.TObject<{
         insert: Type.TOptional<Type.TObject<{
             id: Type.TUnsafe<import("../../core/index.js").ChangesetLocalId>;

package/lib/feature-libraries/sequence-field/formatV2.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"formatV2.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/formatV2.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAC;AAC1C,OAAO,KAAK,EAAiB,MAAM,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAQxE,QAAA,MAAM,SAAS,cAA6C,CAAC;AAE7D,QAAA,MAAM,MAAM,8DAAyB,CAAC;AAItC,QAAA,MAAM,OAAO,2FAAkD,CAAC;AAEhE,eAAO,MAAM,MAAM,sUAAsB,CAAC;AAI1C,QAAA,MAAM,MAAM;;;EAAiE,CAAC;AAQ9E,QAAA,MAAM,MAAM;;;;EAAqD,CAAC;AAMlE,QAAA,MAAM,MAAM;;;;EASX,CAAC;AAEF,QAAA,MAAM,OAAO;;;;;EAAmE,CAAC;AAEjF,QAAA,MAAM,MAAM;;;;;;;;;;EAMX,CAAC;AAEF,QAAA,MAAM,MAAM;;;;;;;;;;;;EAMX,CAAC;AAEF,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;EAGnB,CAAC;AAEH,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAUtB,CAAC;AAEF,eAAO,MAAM,QAAQ,~~wEACb~~,KAAK,~~eACC~~,WAAW;;;;;EAavB,CAAC;AAIH,QAAA,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;~~EACwB~~,CAAC;AAInC,eAAO,MAAM,SAAS,~~6CAAyC~~,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GACvC,CAAC;AAE/B;;GAEG;AACH,yBAAiB,OAAO,CAAC;IACxB,KAAY,SAAS,GAAG,MAAM,CAAC,OAAO,SAAS,CAAC,CAAC;IAEjD,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,KAAY,OAAO,GAAG,MAAM,CAAC,OAAO,OAAO,CAAC,CAAC;IAE7C,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAE3C,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,KAAY,OAAO,GAAG,MAAM,CAAC,OAAO,OAAO,CAAC,CAAC;IAC7C,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,KAAY,eAAe,GAAG,MAAM,CAAC,OAAO,eAAe,CAAC,CAAC;IAC7D,KAAY,UAAU,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC;IAEnD,KAAY,QAAQ,CAAC,MAAM,SAAS,OAAO,EAAE,WAAW,SAAS,OAAO,IAAI,MAAM,CACjF,UAAU,CAAC,OAAO,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAChD,CAAC;IACF,KAAY,IAAI,CAAC,MAAM,SAAS,OAAO,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACnF,KAAY,SAAS,CAAC,MAAM,SAAS,OAAO,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;CAC7F"}
1	+ {"version":3,"file":"formatV2.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/formatV2.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAC;AAC1C,OAAO,KAAK,EAAiB,MAAM,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAQxE,QAAA,MAAM,SAAS,cAA6C,CAAC;AAE7D,QAAA,MAAM,MAAM,8DAAyB,CAAC;AAItC,QAAA,MAAM,OAAO,2FAAkD,CAAC;AAEhE,eAAO,MAAM,MAAM,sUAAsB,CAAC;AAI1C,QAAA,MAAM,MAAM;;;EAAiE,CAAC;AAQ9E,QAAA,MAAM,MAAM;;;;EAAqD,CAAC;AAMlE,QAAA,MAAM,MAAM;;;;EASX,CAAC;AAEF,QAAA,MAAM,OAAO;;;;;EAAmE,CAAC;AAEjF,QAAA,MAAM,MAAM;;;;;;;;;;EAMX,CAAC;AAEF,QAAA,MAAM,MAAM;;;;;;;;;;;;EAMX,CAAC;AAEF,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;EAGnB,CAAC;AAEH,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAUtB,CAAC;AAEF,eAAO,MAAM,QAAQ,GAAI,KAAK,SAAS,OAAO,EAAE,WAAW,SAAS,OAAO,EAC1E,OAAO,KAAK,EACZ,aAAa,WAAW;;;;;EAavB,CAAC;AAIH,QAAA,MAAM,IAAI,GAAI,MAAM,SAAS,OAAO,EAAE,aAAa,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EACvB,CAAC;AAInC,eAAO,MAAM,SAAS,GAAI,MAAM,SAAS,OAAO,EAAE,aAAa,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GACvC,CAAC;AAE/B;;GAEG;AACH,yBAAiB,OAAO,CAAC;IACxB,KAAY,SAAS,GAAG,MAAM,CAAC,OAAO,SAAS,CAAC,CAAC;IAEjD,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,KAAY,OAAO,GAAG,MAAM,CAAC,OAAO,OAAO,CAAC,CAAC;IAE7C,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAE3C,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,KAAY,OAAO,GAAG,MAAM,CAAC,OAAO,OAAO,CAAC,CAAC;IAC7C,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,KAAY,eAAe,GAAG,MAAM,CAAC,OAAO,eAAe,CAAC,CAAC;IAC7D,KAAY,UAAU,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC;IAEnD,KAAY,QAAQ,CAAC,MAAM,SAAS,OAAO,EAAE,WAAW,SAAS,OAAO,IAAI,MAAM,CACjF,UAAU,CAAC,OAAO,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAChD,CAAC;IACF,KAAY,IAAI,CAAC,MAAM,SAAS,OAAO,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACnF,KAAY,SAAS,CAAC,MAAM,SAAS,OAAO,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;CAC7F"}

package/lib/feature-libraries/sequence-field/formatV3.d.ts CHANGED Viewed

@@ -59,7 +59,7 @@ declare const MarkEffect: Type.TObject<{
         idOverride: Type.TUnion<[Type.TTuple<[Type.TUnsafe<import("../../core/index.js").ChangesetLocalId>, Type.TUnion<[Type.TLiteral<"root">, Type.TUnsafe<import("../../util/brand.js").Brand<import("@fluidframework/id-compressor").OpSpaceCompressedId, "EncodedRevisionTag">>]>]>, Type.TUnsafe<import("../../core/index.js").ChangesetLocalId>]>;
     }>>;
 }>;
-declare const Mark: <Schema extends Type.TSchema>(tNodeChange: Schema) => Type.TObject<{
+declare const Mark: <Schema extends TSchema>(tNodeChange: Schema) => Type.TObject<{
     effect: Type.TOptional<Type.TObject<{
         remove: Type.TOptional<Type.TObject<{
             id: Type.TUnsafe<import("../../core/index.js").ChangesetLocalId>;
@@ -115,7 +115,7 @@ declare const Mark: <Schema extends Type.TSchema>(tNodeChange: Schema) => Type.T
     changes: Schema extends Type.TOptional<infer S extends Type.TSchema> ? Type.TOptional<S> : Type.Ensure<Type.TOptional<Schema>>;
     count: Type.TNumber;
 }>;
-export declare const Changeset: <Schema extends Type.TSchema>(tNodeChange: Schema) => Type.TArray<Type.TObject<{
+export declare const Changeset: <Schema extends TSchema>(tNodeChange: Schema) => Type.TArray<Type.TObject<{
     effect: Type.TOptional<Type.TObject<{
         remove: Type.TOptional<Type.TObject<{
             id: Type.TUnsafe<import("../../core/index.js").ChangesetLocalId>;

package/lib/feature-libraries/sequence-field/formatV3.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"formatV3.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/formatV3.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAC;AAC1C,OAAO,KAAK,EAAiB,MAAM,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAIxE,OAAO,EAGN,KAAK,OAAO,IAAI,SAAS,EAEzB,MAAM,eAAe,CAAC;AAIvB,QAAA,MAAM,MAAM;;EAKX,CAAC;AAEF,QAAA,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGf,CAAC;AAIF,QAAA,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;~~EACwB~~,CAAC;AAInC,eAAO,MAAM,SAAS,~~6CAAyC~~,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GACvC,CAAC;AAE/B;;GAEG;AACH,yBAAiB,OAAO,CAAC;IACxB,KAAY,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;IAE5C,KAAY,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IACtC,KAAY,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;IACxC,KAAY,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IACtC,KAAY,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IACtC,KAAY,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IACtC,KAAY,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IACtC,KAAY,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;IACxC,KAAY,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IACtC,KAAY,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IACtC,KAAY,eAAe,GAAG,SAAS,CAAC,eAAe,CAAC;IACxD,KAAY,QAAQ,CACnB,MAAM,SAAS,OAAO,EACtB,WAAW,SAAS,OAAO,IACxB,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAE5C,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,KAAY,UAAU,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC;IACnD,KAAY,IAAI,CAAC,MAAM,SAAS,OAAO,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACnF,KAAY,SAAS,CAAC,MAAM,SAAS,OAAO,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;CAC7F"}
1	+ {"version":3,"file":"formatV3.d.ts","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/formatV3.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAC;AAC1C,OAAO,KAAK,EAAiB,MAAM,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAIxE,OAAO,EAGN,KAAK,OAAO,IAAI,SAAS,EAEzB,MAAM,eAAe,CAAC;AAIvB,QAAA,MAAM,MAAM;;EAKX,CAAC;AAEF,QAAA,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGf,CAAC;AAIF,QAAA,MAAM,IAAI,GAAI,MAAM,SAAS,OAAO,EAAE,aAAa,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EACvB,CAAC;AAInC,eAAO,MAAM,SAAS,GAAI,MAAM,SAAS,OAAO,EAAE,aAAa,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GACvC,CAAC;AAE/B;;GAEG;AACH,yBAAiB,OAAO,CAAC;IACxB,KAAY,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;IAE5C,KAAY,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IACtC,KAAY,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;IACxC,KAAY,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IACtC,KAAY,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IACtC,KAAY,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IACtC,KAAY,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IACtC,KAAY,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;IACxC,KAAY,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IACtC,KAAY,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IACtC,KAAY,eAAe,GAAG,SAAS,CAAC,eAAe,CAAC;IACxD,KAAY,QAAQ,CACnB,MAAM,SAAS,OAAO,EACtB,WAAW,SAAS,OAAO,IACxB,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAE5C,KAAY,MAAM,GAAG,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,KAAY,UAAU,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC;IACnD,KAAY,IAAI,CAAC,MAAM,SAAS,OAAO,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACnF,KAAY,SAAS,CAAC,MAAM,SAAS,OAAO,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;CAC7F"}

package/lib/feature-libraries/sequence-field/markListFactory.js CHANGED Viewed

@@ -11,10 +11,9 @@ import { isNoopMark, isTombstone, tryMergeMarks as tryMergeMarks } from "./utils
  * - Merges marks together
  */
 export class MarkListFactory {
-    constructor() {
-        this.offset = 0;
-        this.list = [];
-    }
+    offset = 0;
+    list = [];
+    constructor() { }
     push(...marks) {
         for (const item of marks) {
             this.pushContent(item);

package/lib/feature-libraries/sequence-field/markListFactory.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"markListFactory.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/markListFactory.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,IAAI,aAAa,EAAE,MAAM,YAAY,CAAC;AAErF;;;;;;GAMG;AACH,MAAM,OAAO,eAAe;~~IAI3B;QAHQ~~,~~WAAM~~,GAAG,CAAC,CAAC;~~QACH~~,~~SAAI~~,GAAa,EAAE,CAAC;~~IAEd~~,CAAC;IAEhB,IAAI,CAAC,GAAG,KAAa;QAC3B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YAC1B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;IACF,CAAC;IAEM,UAAU,CAAC,MAAc;QAC/B,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC;IACvB,CAAC;IAEM,WAAW,CAAC,IAAU;QAC5B,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1E,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5B,OAAO;QACR,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;YACvC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QACjB,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC7C,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;YACnD,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACzC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBAC1B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;gBAChC,OAAO;YACR,CAAC;QACF,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;CACD","sourcesContent":["/!\n Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n /\n\nimport type { Mark, MarkList } from \"./types.js\";\nimport { isNoopMark, isTombstone, tryMergeMarks as tryMergeMarks } from \"./utils.js\";\n\n/\n Helper class for constructing an offset list of marks that...\n * - Does not insert offsets if there is no content after them\n * - Does not insert 0-sized offsets\n * - Merges runs of offsets together\n * - Merges marks together\n */\nexport class MarkListFactory {\n\tprivate offset = 0;\n\tpublic readonly list: MarkList = [];\n\n\tpublic constructor() {}\n\n\tpublic push(...marks: Mark[]): void {\n\t\tfor (const item of marks) {\n\t\t\tthis.pushContent(item);\n\t\t}\n\t}\n\n\tpublic pushOffset(offset: number): void {\n\t\tthis.offset += offset;\n\t}\n\n\tpublic pushContent(mark: Mark): void {\n\t\tif (isNoopMark(mark) && mark.changes === undefined && !isTombstone(mark)) {\n\t\t\tthis.pushOffset(mark.count);\n\t\t\treturn;\n\t\t}\n\t\tif (this.offset > 0) {\n\t\t\tthis.list.push({ count: this.offset });\n\t\t\tthis.offset = 0;\n\t\t}\n\t\tconst prev = this.list[this.list.length - 1];\n\t\tif (prev !== undefined && prev.type === mark.type) {\n\t\t\tconst merged = tryMergeMarks(prev, mark);\n\t\t\tif (merged !== undefined) {\n\t\t\t\tthis.list.splice(-1, 1, merged);\n\t\t\t\treturn;\n\t\t\t}\n\t\t}\n\t\tthis.list.push(mark);\n\t}\n}\n"]}
1	+ {"version":3,"file":"markListFactory.js","sourceRoot":"","sources":["../../../src/feature-libraries/sequence-field/markListFactory.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,IAAI,aAAa,EAAE,MAAM,YAAY,CAAC;AAErF;;;;;;GAMG;AACH,MAAM,OAAO,eAAe;IACnB,MAAM,GAAG,CAAC,CAAC;IACH,IAAI,GAAa,EAAE,CAAC;IAEpC,gBAAsB,CAAC;IAEhB,IAAI,CAAC,GAAG,KAAa;QAC3B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YAC1B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;IACF,CAAC;IAEM,UAAU,CAAC,MAAc;QAC/B,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC;IACvB,CAAC;IAEM,WAAW,CAAC,IAAU;QAC5B,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1E,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5B,OAAO;QACR,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;YACvC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QACjB,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC7C,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;YACnD,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACzC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBAC1B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;gBAChC,OAAO;YACR,CAAC;QACF,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;CACD","sourcesContent":["/!\n Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n /\n\nimport type { Mark, MarkList } from \"./types.js\";\nimport { isNoopMark, isTombstone, tryMergeMarks as tryMergeMarks } from \"./utils.js\";\n\n/\n Helper class for constructing an offset list of marks that...\n * - Does not insert offsets if there is no content after them\n * - Does not insert 0-sized offsets\n * - Merges runs of offsets together\n * - Merges marks together\n */\nexport class MarkListFactory {\n\tprivate offset = 0;\n\tpublic readonly list: MarkList = [];\n\n\tpublic constructor() {}\n\n\tpublic push(...marks: Mark[]): void {\n\t\tfor (const item of marks) {\n\t\t\tthis.pushContent(item);\n\t\t}\n\t}\n\n\tpublic pushOffset(offset: number): void {\n\t\tthis.offset += offset;\n\t}\n\n\tpublic pushContent(mark: Mark): void {\n\t\tif (isNoopMark(mark) && mark.changes === undefined && !isTombstone(mark)) {\n\t\t\tthis.pushOffset(mark.count);\n\t\t\treturn;\n\t\t}\n\t\tif (this.offset > 0) {\n\t\t\tthis.list.push({ count: this.offset });\n\t\t\tthis.offset = 0;\n\t\t}\n\t\tconst prev = this.list[this.list.length - 1];\n\t\tif (prev !== undefined && prev.type === mark.type) {\n\t\t\tconst merged = tryMergeMarks(prev, mark);\n\t\t\tif (merged !== undefined) {\n\t\t\t\tthis.list.splice(-1, 1, merged);\n\t\t\t\treturn;\n\t\t\t}\n\t\t}\n\t\tthis.list.push(mark);\n\t}\n}\n"]}