@fluidframework/merge-tree 0.59.4002 → 1.0.2

package/lib/mergeTreeDeltaCallback.d.ts

@@ -6,26 +6,24 @@ import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"
 import { IMergeTreeGroupMsg, IMergeTreeOp, MergeTreeDeltaType } from "./ops";
 import { PropertySet } from "./properties";
 import { ISegment } from "./mergeTree";
-export declare type MergeTreeDeltaOperationType = MergeTreeDeltaType.ANNOTATE | MergeTreeDeltaType.INSERT | MergeTreeDeltaType.REMOVE;
-export declare const enum MergeTreeMaintenanceType {
-    APPEND = -1,
-    SPLIT = -2,
+export declare type MergeTreeDeltaOperationType = typeof MergeTreeDeltaType.ANNOTATE | typeof MergeTreeDeltaType.INSERT | typeof MergeTreeDeltaType.REMOVE;
+export declare const MergeTreeMaintenanceType: {
+    readonly APPEND: -1;
+    readonly SPLIT: -2;
     /**
      * Notification that a segment has been unlinked from the MergeTree.  This occurs during
      * Zamboni when:
      *
-     *    a) The minSeq has moved past the segment's removeSeq, in which case the segment
-     *       can no longer be referenced by incoming remote ops, and...
-     *
      *    b) The segment's tracking collection is empty (e.g., not being tracked for undo/redo).
      */
-    UNLINK = -3,
+    readonly UNLINK: -3;
     /**
      * Notification that a local change has been acknowledged by the server.
      * This means that it has made the round trip to the server and has had a sequence number assigned.
      */
-    ACKNOWLEDGED = -4
-}
+    readonly ACKNOWLEDGED: -4;
+};
+export declare type MergeTreeMaintenanceType = typeof MergeTreeMaintenanceType[keyof typeof MergeTreeMaintenanceType];
 export declare type MergeTreeDeltaOperationTypes = MergeTreeDeltaOperationType | MergeTreeMaintenanceType;
 export interface IMergeTreeDeltaCallbackArgs<TOperationType extends MergeTreeDeltaOperationTypes = MergeTreeDeltaOperationType> {
     readonly operation: TOperationType;

package/lib/mergeTreeDeltaCallback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mergeTreeDeltaCallback.d.ts","sourceRoot":"","sources":["../src/mergeTreeDeltaCallback.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EACH,kBAAkB,EAClB,YAAY,EACZ,kBAAkB,EACrB,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,oBAAY,2BAA2B,GACnC,kBAAkB,CAAC,QAAQ,GAAG,kBAAkB,CAAC,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC;AAGxF,0BAAkB,wBAAwB;IACtC,MAAM,KAAK;IACX,KAAK,KAAK;IACV;;;;;;;;OAQG;IACH,MAAM,KAAK;IACX;;;OAGG;IACH,YAAY,KAAK;CACpB;AAED,oBAAY,4BAA4B,GAAG,2BAA2B,GAAG,wBAAwB,CAAC;AAGlG,MAAM,WAAW,2BAA2B,CAAC,cAAc,SAAS,4BAA4B,GAAG,2BAA2B;IAC1H,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;IACnC,QAAQ,CAAC,aAAa,EAAE,sBAAsB,EAAE,CAAC;CACpD;AAED,MAAM,WAAW,sBAAsB;IACnC,OAAO,EAAE,QAAQ,CAAC;IAClB,cAAc,CAAC,EAAE,WAAW,CAAC;CAChC;AAED,MAAM,WAAW,qBAAqB;IAClC;;;OAGG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,kBAAkB,CAAC;IACtC;;OAEG;IACH,QAAQ,CAAC,EAAE,EAAE,YAAY,CAAC;IAC1B;;;OAGG;IACH,QAAQ,CAAC,gBAAgB,CAAC,EAAE,yBAAyB,CAAC;CACzD;AAED,MAAM,WAAW,4BAA4B;IACzC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,uBAAuB,EAAE,MAAM,CAAC;IACzC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACnC;AAED,oBAAY,sBAAsB,GAC9B,CAAC,MAAM,EAAE,qBAAqB,EAAE,SAAS,EAAE,2BAA2B,KAAK,IAAI,CAAC;AAGpF,MAAM,WAAW,iCAAkC,SAAQ,2BAA2B,CAAC,wBAAwB,CAAC;CAAI;AAEpH,oBAAY,4BAA4B,GACpC,CAAC,eAAe,EAAE,iCAAiC,EAAE,MAAM,EAAE,qBAAqB,GAAG,SAAS,KAAK,IAAI,CAAC"}
+{"version":3,"file":"mergeTreeDeltaCallback.d.ts","sourceRoot":"","sources":["../src/mergeTreeDeltaCallback.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EACH,kBAAkB,EAClB,YAAY,EACZ,kBAAkB,EACrB,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,oBAAY,2BAA2B,GACnC,OAAO,kBAAkB,CAAC,QAAQ,GAAG,OAAO,kBAAkB,CAAC,MAAM,GAAG,OAAO,kBAAkB,CAAC,MAAM,CAAC;AAG7G,eAAO,MAAM,wBAAwB;;;IAGjC;;;;;OAKG;;IAEH;;;OAGG;;CAEG,CAAC;AACX,oBAAY,wBAAwB,GAAG,OAAO,wBAAwB,CAAC,MAAM,OAAO,wBAAwB,CAAC,CAAC;AAE9G,oBAAY,4BAA4B,GAAG,2BAA2B,GAAG,wBAAwB,CAAC;AAGlG,MAAM,WAAW,2BAA2B,CAAC,cAAc,SAAS,4BAA4B,GAAG,2BAA2B;IAC1H,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;IACnC,QAAQ,CAAC,aAAa,EAAE,sBAAsB,EAAE,CAAC;CACpD;AAED,MAAM,WAAW,sBAAsB;IACnC,OAAO,EAAE,QAAQ,CAAC;IAClB,cAAc,CAAC,EAAE,WAAW,CAAC;CAChC;AAED,MAAM,WAAW,qBAAqB;IAClC;;;OAGG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,kBAAkB,CAAC;IACtC;;OAEG;IACH,QAAQ,CAAC,EAAE,EAAE,YAAY,CAAC;IAC1B;;;OAGG;IACH,QAAQ,CAAC,gBAAgB,CAAC,EAAE,yBAAyB,CAAC;CACzD;AAED,MAAM,WAAW,4BAA4B;IACzC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,uBAAuB,EAAE,MAAM,CAAC;IACzC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACnC;AAED,oBAAY,sBAAsB,GAC9B,CAAC,MAAM,EAAE,qBAAqB,EAAE,SAAS,EAAE,2BAA2B,KAAK,IAAI,CAAC;AAGpF,MAAM,WAAW,iCAAkC,SAAQ,2BAA2B,CAAC,wBAAwB,CAAC;CAAI;AAEpH,oBAAY,4BAA4B,GACpC,CAAC,eAAe,EAAE,iCAAiC,EAAE,MAAM,EAAE,qBAAqB,GAAG,SAAS,KAAK,IAAI,CAAC"}

package/lib/mergeTreeDeltaCallback.js

@@ -3,24 +3,20 @@
  * Licensed under the MIT License.
  */
 // Note: Assigned negative integers to avoid clashing with MergeTreeDeltaType
-export var MergeTreeMaintenanceType;
-(function (MergeTreeMaintenanceType) {
-    MergeTreeMaintenanceType[MergeTreeMaintenanceType["APPEND"] = -1] = "APPEND";
-    MergeTreeMaintenanceType[MergeTreeMaintenanceType["SPLIT"] = -2] = "SPLIT";
+export const MergeTreeMaintenanceType = {
+    APPEND: -1,
+    SPLIT: -2,
     /**
      * Notification that a segment has been unlinked from the MergeTree.  This occurs during
      * Zamboni when:
      *
-     *    a) The minSeq has moved past the segment's removeSeq, in which case the segment
-     *       can no longer be referenced by incoming remote ops, and...
-     *
      *    b) The segment's tracking collection is empty (e.g., not being tracked for undo/redo).
      */
-    MergeTreeMaintenanceType[MergeTreeMaintenanceType["UNLINK"] = -3] = "UNLINK";
+    UNLINK: -3,
     /**
      * Notification that a local change has been acknowledged by the server.
      * This means that it has made the round trip to the server and has had a sequence number assigned.
      */
-    MergeTreeMaintenanceType[MergeTreeMaintenanceType["ACKNOWLEDGED"] = -4] = "ACKNOWLEDGED";
-})(MergeTreeMaintenanceType || (MergeTreeMaintenanceType = {}));
+    ACKNOWLEDGED: -4,
+};
 //# sourceMappingURL=mergeTreeDeltaCallback.js.map

package/lib/mergeTreeDeltaCallback.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergeTreeDeltaCallback.js","sourceRoot":"","sources":["../src/mergeTreeDeltaCallback.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAcH,6EAA6E;AAC7E,MAAM,CAAN,IAAkB,wBAkBjB;AAlBD,WAAkB,wBAAwB;IACtC,4EAAW,CAAA;IACX,0EAAU,CAAA;IACV;;;;;;;;OAQG;IACH,4EAAW,CAAA;IACX;;;OAGG;IACH,wFAAiB,CAAA;AACrB,CAAC,EAlBiB,wBAAwB,KAAxB,wBAAwB,QAkBzC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { ISequencedDocumentMessage } from \"@fluidframework/protocol-definitions\";\nimport {\n    IMergeTreeGroupMsg,\n    IMergeTreeOp,\n    MergeTreeDeltaType,\n} from \"./ops\";\nimport { PropertySet } from \"./properties\";\nimport { ISegment } from \"./mergeTree\";\n\nexport type MergeTreeDeltaOperationType =\n    MergeTreeDeltaType.ANNOTATE | MergeTreeDeltaType.INSERT | MergeTreeDeltaType.REMOVE;\n\n// Note: Assigned negative integers to avoid clashing with MergeTreeDeltaType\nexport const enum MergeTreeMaintenanceType {\n    APPEND = -1,\n    SPLIT = -2,\n    /**\n     * Notification that a segment has been unlinked from the MergeTree.  This occurs during\n     * Zamboni when:\n     *\n     *    a) The minSeq has moved past the segment's removeSeq, in which case the segment\n     *       can no longer be referenced by incoming remote ops, and...\n     *\n     *    b) The segment's tracking collection is empty (e.g., not being tracked for undo/redo).\n     */\n    UNLINK = -3,\n    /**\n     * Notification that a local change has been acknowledged by the server.\n     * This means that it has made the round trip to the server and has had a sequence number assigned.\n     */\n    ACKNOWLEDGED = -4,\n}\n\nexport type MergeTreeDeltaOperationTypes = MergeTreeDeltaOperationType | MergeTreeMaintenanceType;\n\n// eslint-disable-next-line max-len\nexport interface IMergeTreeDeltaCallbackArgs<TOperationType extends MergeTreeDeltaOperationTypes = MergeTreeDeltaOperationType> {\n    readonly operation: TOperationType;\n    readonly deltaSegments: IMergeTreeSegmentDelta[];\n}\n\nexport interface IMergeTreeSegmentDelta {\n    segment: ISegment;\n    propertyDeltas?: PropertySet;\n}\n\nexport interface IMergeTreeDeltaOpArgs {\n    /**\n     * The group op which contains the operation\n     * if there operation is part of a group op.\n     */\n    readonly groupOp?: IMergeTreeGroupMsg;\n    /**\n     * The merge tree operation\n     */\n    readonly op: IMergeTreeOp;\n    /**\n     * Get the sequence message, should only be null if the\n     * Delta op args are for an unacked local change\n     */\n    readonly sequencedMessage?: ISequencedDocumentMessage;\n}\n\nexport interface IMergeTreeClientSequenceArgs {\n    readonly clientId: number;\n    readonly referenceSequenceNumber: number;\n    readonly sequenceNumber: number;\n}\n\nexport type MergeTreeDeltaCallback =\n    (opArgs: IMergeTreeDeltaOpArgs, deltaArgs: IMergeTreeDeltaCallbackArgs) => void;\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IMergeTreeMaintenanceCallbackArgs extends IMergeTreeDeltaCallbackArgs<MergeTreeMaintenanceType> { }\n\nexport type MergeTreeMaintenanceCallback =\n    (MaintenanceArgs: IMergeTreeMaintenanceCallbackArgs, opArgs: IMergeTreeDeltaOpArgs | undefined) => void;\n"]}
+{"version":3,"file":"mergeTreeDeltaCallback.js","sourceRoot":"","sources":["../src/mergeTreeDeltaCallback.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAcH,6EAA6E;AAC7E,MAAM,CAAC,MAAM,wBAAwB,GAAG;IACpC,MAAM,EAAE,CAAC,CAAC;IACV,KAAK,EAAE,CAAC,CAAC;IACT;;;;;OAKG;IACH,MAAM,EAAE,CAAC,CAAC;IACV;;;OAGG;IACH,YAAY,EAAE,CAAC,CAAC;CACV,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { ISequencedDocumentMessage } from \"@fluidframework/protocol-definitions\";\nimport {\n    IMergeTreeGroupMsg,\n    IMergeTreeOp,\n    MergeTreeDeltaType,\n} from \"./ops\";\nimport { PropertySet } from \"./properties\";\nimport { ISegment } from \"./mergeTree\";\n\nexport type MergeTreeDeltaOperationType =\n    typeof MergeTreeDeltaType.ANNOTATE | typeof MergeTreeDeltaType.INSERT | typeof MergeTreeDeltaType.REMOVE;\n\n// Note: Assigned negative integers to avoid clashing with MergeTreeDeltaType\nexport const MergeTreeMaintenanceType = {\n    APPEND: -1,\n    SPLIT: -2,\n    /**\n     * Notification that a segment has been unlinked from the MergeTree.  This occurs during\n     * Zamboni when:\n     *\n     *    b) The segment's tracking collection is empty (e.g., not being tracked for undo/redo).\n     */\n    UNLINK: -3,\n    /**\n     * Notification that a local change has been acknowledged by the server.\n     * This means that it has made the round trip to the server and has had a sequence number assigned.\n     */\n    ACKNOWLEDGED: -4,\n} as const;\nexport type MergeTreeMaintenanceType = typeof MergeTreeMaintenanceType[keyof typeof MergeTreeMaintenanceType];\n\nexport type MergeTreeDeltaOperationTypes = MergeTreeDeltaOperationType | MergeTreeMaintenanceType;\n\n// eslint-disable-next-line max-len\nexport interface IMergeTreeDeltaCallbackArgs<TOperationType extends MergeTreeDeltaOperationTypes = MergeTreeDeltaOperationType> {\n    readonly operation: TOperationType;\n    readonly deltaSegments: IMergeTreeSegmentDelta[];\n}\n\nexport interface IMergeTreeSegmentDelta {\n    segment: ISegment;\n    propertyDeltas?: PropertySet;\n}\n\nexport interface IMergeTreeDeltaOpArgs {\n    /**\n     * The group op which contains the operation\n     * if there operation is part of a group op.\n     */\n    readonly groupOp?: IMergeTreeGroupMsg;\n    /**\n     * The merge tree operation\n     */\n    readonly op: IMergeTreeOp;\n    /**\n     * Get the sequence message, should only be null if the\n     * Delta op args are for an unacked local change\n     */\n    readonly sequencedMessage?: ISequencedDocumentMessage;\n}\n\nexport interface IMergeTreeClientSequenceArgs {\n    readonly clientId: number;\n    readonly referenceSequenceNumber: number;\n    readonly sequenceNumber: number;\n}\n\nexport type MergeTreeDeltaCallback =\n    (opArgs: IMergeTreeDeltaOpArgs, deltaArgs: IMergeTreeDeltaCallbackArgs) => void;\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IMergeTreeMaintenanceCallbackArgs extends IMergeTreeDeltaCallbackArgs<MergeTreeMaintenanceType> { }\n\nexport type MergeTreeMaintenanceCallback =\n    (MaintenanceArgs: IMergeTreeMaintenanceCallbackArgs, opArgs: IMergeTreeDeltaOpArgs | undefined) => void;\n"]}

package/lib/opBuilder.js

@@ -2,6 +2,7 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
+import { MergeTreeDeltaType, } from "./ops";
 /**
  * Creates the op for annotating the markers with the provided properties
  * @param marker - The marker to annotate
@@ -19,7 +20,7 @@ export function createAnnotateMarkerOp(marker, props, combiningOp) {
         props,
         relativePos1: { id, before: true },
         relativePos2: { id },
-        type: 2 /* ANNOTATE */,
+        type: MergeTreeDeltaType.ANNOTATE,
     };
 }
 /**
@@ -36,7 +37,7 @@ export function createAnnotateRangeOp(start, end, props, combiningOp) {
         pos1: start,
         pos2: end,
         props,
-        type: 2 /* ANNOTATE */,
+        type: MergeTreeDeltaType.ANNOTATE,
     };
 }
 /**
@@ -49,7 +50,7 @@ export function createRemoveRangeOp(start, end) {
     return {
         pos1: start,
         pos2: end,
-        type: 1 /* REMOVE */,
+        type: MergeTreeDeltaType.REMOVE,
     };
 }
 /**
@@ -64,7 +65,7 @@ export function createInsertOp(pos, segSpec) {
     return {
         pos1: pos,
         seg: segSpec,
-        type: 0 /* INSERT */,
+        type: MergeTreeDeltaType.INSERT,
     };
 }
 /**
@@ -74,7 +75,7 @@ export function createInsertOp(pos, segSpec) {
 export function createGroupOp(...ops) {
     return {
         ops,
-        type: 3 /* GROUP */,
+        type: MergeTreeDeltaType.GROUP,
     };
 }
 //# sourceMappingURL=opBuilder.js.map

package/lib/opBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"opBuilder.js","sourceRoot":"","sources":["../src/opBuilder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAcH;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CAClC,MAAc,EAAE,KAAkB,EAAE,WAA0B;IAC9D,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;IAC1B,IAAI,CAAC,EAAE,EAAE;QACL,OAAO,SAAS,CAAC;KACpB;IAED,OAAO;QACH,WAAW;QACX,KAAK;QACL,YAAY,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;QAClC,YAAY,EAAE,EAAE,EAAE,EAAE;QACpB,IAAI,kBAA6B;KACpC,CAAC;AACN,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,qBAAqB,CACjC,KAAa,EAAE,GAAW,EAAE,KAAkB,EAAE,WAAqC;IACrF,OAAO;QACH,WAAW;QACX,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,GAAG;QACT,KAAK;QACL,IAAI,kBAA6B;KACpC,CAAC;AACN,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAa,EAAE,GAAW;IAC1D,OAAO;QACH,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,GAAG;QACT,IAAI,gBAA2B;KAClC,CAAC;AACN,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,GAAW,EAAE,OAAiB;IAChE,OAAO,cAAc,CACjB,GAAG,EACH,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,GAAW,EAAE,OAAY;IACpD,OAAO;QACH,IAAI,EAAE,GAAG;QACT,GAAG,EAAE,OAAO;QACZ,IAAI,gBAA2B;KAClC,CAAC;AACN,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CACzB,GAAG,GAAwB;IAC3B,OAAO;QACH,GAAG;QACH,IAAI,eAA0B;KACjC,CAAC;AACN,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { ISegment, Marker } from \"./mergeTree\";\nimport {\n    ICombiningOp,\n    IMergeTreeAnnotateMsg,\n    IMergeTreeGroupMsg,\n    IMergeTreeInsertMsg,\n    IMergeTreeRemoveMsg,\n    MergeTreeDeltaType,\n    IMergeTreeDeltaOp,\n} from \"./ops\";\nimport { PropertySet } from \"./properties\";\n\n/**\n * Creates the op for annotating the markers with the provided properties\n * @param marker - The marker to annotate\n * @param props - The properties to annotate the marker with\n * @param combiningOp - Optional. Specifies how to combine values for the property, such as \"incr\" for increment.\n * @returns The annotate op\n */\nexport function createAnnotateMarkerOp(\n    marker: Marker, props: PropertySet, combiningOp?: ICombiningOp): IMergeTreeAnnotateMsg | undefined {\n    const id = marker.getId();\n    if (!id) {\n        return undefined;\n    }\n\n    return {\n        combiningOp,\n        props,\n        relativePos1: { id, before: true },\n        relativePos2: { id },\n        type: MergeTreeDeltaType.ANNOTATE,\n    };\n}\n\n/**\n * Creates the op for annotating the range with the provided properties\n * @param start - The inclusive start position of the range to annotate\n * @param end - The exclusive end position of the range to annotate\n * @param props - The properties to annotate the range with\n * @param combiningOp - Optional. Specifies how to combine values for the property, such as \"incr\" for increment.\n * @returns The annotate op\n */\nexport function createAnnotateRangeOp(\n    start: number, end: number, props: PropertySet, combiningOp: ICombiningOp | undefined): IMergeTreeAnnotateMsg {\n    return {\n        combiningOp,\n        pos1: start,\n        pos2: end,\n        props,\n        type: MergeTreeDeltaType.ANNOTATE,\n    };\n}\n\n/**\n * Creates the op to remove a range\n *\n * @param start - The inclusive start of the range to remove\n * @param end - The exclusive end of the range to remove\n */\nexport function createRemoveRangeOp(start: number, end: number): IMergeTreeRemoveMsg {\n    return {\n        pos1: start,\n        pos2: end,\n        type: MergeTreeDeltaType.REMOVE,\n    };\n}\n\n/**\n *\n * @param pos - The position to insert the segment at\n * @param segment - The segment to insert\n */\nexport function createInsertSegmentOp(pos: number, segment: ISegment): IMergeTreeInsertMsg {\n    return createInsertOp(\n        pos,\n        segment.toJSONObject());\n}\n\nexport function createInsertOp(pos: number, segSpec: any): IMergeTreeInsertMsg {\n    return {\n        pos1: pos,\n        seg: segSpec,\n        type: MergeTreeDeltaType.INSERT,\n    };\n}\n\n/**\n *\n * @param ops - The ops to group\n */\nexport function createGroupOp(\n    ...ops: IMergeTreeDeltaOp[]): IMergeTreeGroupMsg {\n    return {\n        ops,\n        type: MergeTreeDeltaType.GROUP,\n    };\n}\n"]}
+{"version":3,"file":"opBuilder.js","sourceRoot":"","sources":["../src/opBuilder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAMH,kBAAkB,GAErB,MAAM,OAAO,CAAC;AAGf;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CAClC,MAAc,EAAE,KAAkB,EAAE,WAA0B;IAC9D,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;IAC1B,IAAI,CAAC,EAAE,EAAE;QACL,OAAO,SAAS,CAAC;KACpB;IAED,OAAO;QACH,WAAW;QACX,KAAK;QACL,YAAY,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;QAClC,YAAY,EAAE,EAAE,EAAE,EAAE;QACpB,IAAI,EAAE,kBAAkB,CAAC,QAAQ;KACpC,CAAC;AACN,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,qBAAqB,CACjC,KAAa,EAAE,GAAW,EAAE,KAAkB,EAAE,WAAqC;IACrF,OAAO;QACH,WAAW;QACX,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,GAAG;QACT,KAAK;QACL,IAAI,EAAE,kBAAkB,CAAC,QAAQ;KACpC,CAAC;AACN,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAa,EAAE,GAAW;IAC1D,OAAO;QACH,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,GAAG;QACT,IAAI,EAAE,kBAAkB,CAAC,MAAM;KAClC,CAAC;AACN,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,GAAW,EAAE,OAAiB;IAChE,OAAO,cAAc,CACjB,GAAG,EACH,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,GAAW,EAAE,OAAY;IACpD,OAAO;QACH,IAAI,EAAE,GAAG;QACT,GAAG,EAAE,OAAO;QACZ,IAAI,EAAE,kBAAkB,CAAC,MAAM;KAClC,CAAC;AACN,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CACzB,GAAG,GAAwB;IAC3B,OAAO;QACH,GAAG;QACH,IAAI,EAAE,kBAAkB,CAAC,KAAK;KACjC,CAAC;AACN,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { ISegment, Marker } from \"./mergeTree\";\nimport {\n    ICombiningOp,\n    IMergeTreeAnnotateMsg,\n    IMergeTreeGroupMsg,\n    IMergeTreeInsertMsg,\n    IMergeTreeRemoveMsg,\n    MergeTreeDeltaType,\n    IMergeTreeDeltaOp,\n} from \"./ops\";\nimport { PropertySet } from \"./properties\";\n\n/**\n * Creates the op for annotating the markers with the provided properties\n * @param marker - The marker to annotate\n * @param props - The properties to annotate the marker with\n * @param combiningOp - Optional. Specifies how to combine values for the property, such as \"incr\" for increment.\n * @returns The annotate op\n */\nexport function createAnnotateMarkerOp(\n    marker: Marker, props: PropertySet, combiningOp?: ICombiningOp): IMergeTreeAnnotateMsg | undefined {\n    const id = marker.getId();\n    if (!id) {\n        return undefined;\n    }\n\n    return {\n        combiningOp,\n        props,\n        relativePos1: { id, before: true },\n        relativePos2: { id },\n        type: MergeTreeDeltaType.ANNOTATE,\n    };\n}\n\n/**\n * Creates the op for annotating the range with the provided properties\n * @param start - The inclusive start position of the range to annotate\n * @param end - The exclusive end position of the range to annotate\n * @param props - The properties to annotate the range with\n * @param combiningOp - Optional. Specifies how to combine values for the property, such as \"incr\" for increment.\n * @returns The annotate op\n */\nexport function createAnnotateRangeOp(\n    start: number, end: number, props: PropertySet, combiningOp: ICombiningOp | undefined): IMergeTreeAnnotateMsg {\n    return {\n        combiningOp,\n        pos1: start,\n        pos2: end,\n        props,\n        type: MergeTreeDeltaType.ANNOTATE,\n    };\n}\n\n/**\n * Creates the op to remove a range\n *\n * @param start - The inclusive start of the range to remove\n * @param end - The exclusive end of the range to remove\n */\nexport function createRemoveRangeOp(start: number, end: number): IMergeTreeRemoveMsg {\n    return {\n        pos1: start,\n        pos2: end,\n        type: MergeTreeDeltaType.REMOVE,\n    };\n}\n\n/**\n *\n * @param pos - The position to insert the segment at\n * @param segment - The segment to insert\n */\nexport function createInsertSegmentOp(pos: number, segment: ISegment): IMergeTreeInsertMsg {\n    return createInsertOp(\n        pos,\n        segment.toJSONObject());\n}\n\nexport function createInsertOp(pos: number, segSpec: any): IMergeTreeInsertMsg {\n    return {\n        pos1: pos,\n        seg: segSpec,\n        type: MergeTreeDeltaType.INSERT,\n    };\n}\n\n/**\n *\n * @param ops - The ops to group\n */\nexport function createGroupOp(\n    ...ops: IMergeTreeDeltaOp[]): IMergeTreeGroupMsg {\n    return {\n        ops,\n        type: MergeTreeDeltaType.GROUP,\n    };\n}\n"]}

package/lib/ops.d.ts

@@ -10,17 +10,19 @@ export declare enum ReferenceType {
     RangeBegin = 16,
     RangeEnd = 32,
     SlideOnRemove = 64,
+    StayOnRemove = 128,
     Transient = 256
 }
 export interface IMarkerDef {
     refType?: ReferenceType;
 }
-export declare const enum MergeTreeDeltaType {
-    INSERT = 0,
-    REMOVE = 1,
-    ANNOTATE = 2,
-    GROUP = 3
-}
+export declare const MergeTreeDeltaType: {
+    readonly INSERT: 0;
+    readonly REMOVE: 1;
+    readonly ANNOTATE: 2;
+    readonly GROUP: 3;
+};
+export declare type MergeTreeDeltaType = typeof MergeTreeDeltaType[keyof typeof MergeTreeDeltaType];
 export interface IMergeTreeDelta {
     /**
      * Type of this change.
@@ -47,7 +49,7 @@ export interface IRelativePosition {
     offset?: number;
 }
 export interface IMergeTreeInsertMsg extends IMergeTreeDelta {
-    type: MergeTreeDeltaType.INSERT;
+    type: typeof MergeTreeDeltaType.INSERT;
     pos1?: number;
     relativePos1?: IRelativePosition;
     pos2?: number;
@@ -55,7 +57,7 @@ export interface IMergeTreeInsertMsg extends IMergeTreeDelta {
     seg?: any;
 }
 export interface IMergeTreeRemoveMsg extends IMergeTreeDelta {
-    type: MergeTreeDeltaType.REMOVE;
+    type: typeof MergeTreeDeltaType.REMOVE;
     pos1?: number;
     relativePos1?: IRelativePosition;
     pos2?: number;
@@ -68,7 +70,7 @@ export interface ICombiningOp {
     maxValue?: any;
 }
 export interface IMergeTreeAnnotateMsg extends IMergeTreeDelta {
-    type: MergeTreeDeltaType.ANNOTATE;
+    type: typeof MergeTreeDeltaType.ANNOTATE;
     pos1?: number;
     relativePos1?: IRelativePosition;
     pos2?: number;
@@ -77,7 +79,7 @@ export interface IMergeTreeAnnotateMsg extends IMergeTreeDelta {
     combiningOp?: ICombiningOp;
 }
 export interface IMergeTreeGroupMsg extends IMergeTreeDelta {
-    type: MergeTreeDeltaType.GROUP;
+    type: typeof MergeTreeDeltaType.GROUP;
     ops: IMergeTreeDeltaOp[];
 }
 export interface IJSONSegment {

package/lib/ops.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ops.d.ts","sourceRoot":"","sources":["../src/ops.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,oBAAY,aAAa;IACrB,MAAM,IAAM;IACZ,IAAI,IAAM;IACV,SAAS,IAAM;IACf,OAAO,IAAM;IACb,UAAU,KAAO;IACjB,QAAQ,KAAO;IACf,aAAa,KAAO;IACpB,SAAS,MAAQ;CACpB;AAED,MAAM,WAAW,UAAU;IACvB,OAAO,CAAC,EAAE,aAAa,CAAC;CAC3B;AAGD,0BAAkB,kBAAkB;IAChC,MAAM,IAAI;IACV,MAAM,IAAI;IACV,QAAQ,IAAI;IACZ,KAAK,IAAI;CACZ;AAED,MAAM,WAAW,eAAe;IAC5B;;OAEG;IACH,IAAI,EAAE,kBAAkB,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAC9B;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAoB,SAAQ,eAAe;IACxD,IAAI,EAAE,kBAAkB,CAAC,MAAM,CAAC;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,GAAG,CAAC,EAAE,GAAG,CAAC;CACb;AAED,MAAM,WAAW,mBAAoB,SAAQ,eAAe;IACxD,IAAI,EAAE,kBAAkB,CAAC,MAAM,CAAC;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,iBAAiB,CAAC;CACpC;AAED,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,QAAQ,CAAC,EAAE,GAAG,CAAC;CAClB;AAED,MAAM,WAAW,qBAAsB,SAAQ,eAAe;IAC1D,IAAI,EAAE,kBAAkB,CAAC,QAAQ,CAAC;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,WAAW,CAAC,EAAE,YAAY,CAAC;CAC9B;AAED,MAAM,WAAW,kBAAmB,SAAQ,eAAe;IACvD,IAAI,EAAE,kBAAkB,CAAC,KAAK,CAAC;IAC/B,GAAG,EAAE,iBAAiB,EAAE,CAAC;CAC5B;AAED,MAAM,WAAW,YAAY;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC/B;AAED,oBAAY,iBAAiB,GAAG,mBAAmB,GAAG,mBAAmB,GAAG,qBAAqB,CAAC;AAElG,oBAAY,YAAY,GAAG,iBAAiB,GAAG,kBAAkB,CAAC"}
+{"version":3,"file":"ops.d.ts","sourceRoot":"","sources":["../src/ops.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,oBAAY,aAAa;IACrB,MAAM,IAAM;IACZ,IAAI,IAAM;IACV,SAAS,IAAM;IACf,OAAO,IAAM;IACb,UAAU,KAAO;IACjB,QAAQ,KAAO;IACf,aAAa,KAAO;IACpB,YAAY,MAAO;IACnB,SAAS,MAAQ;CACpB;AAED,MAAM,WAAW,UAAU;IACvB,OAAO,CAAC,EAAE,aAAa,CAAC;CAC3B;AAGD,eAAO,MAAM,kBAAkB;;;;;CAKrB,CAAC;AAEX,oBAAY,kBAAkB,GAAG,OAAO,kBAAkB,CAAC,MAAM,OAAO,kBAAkB,CAAC,CAAC;AAE5F,MAAM,WAAW,eAAe;IAC5B;;OAEG;IACH,IAAI,EAAE,kBAAkB,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAC9B;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAoB,SAAQ,eAAe;IACxD,IAAI,EAAE,OAAO,kBAAkB,CAAC,MAAM,CAAC;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,GAAG,CAAC,EAAE,GAAG,CAAC;CACb;AAED,MAAM,WAAW,mBAAoB,SAAQ,eAAe;IACxD,IAAI,EAAE,OAAO,kBAAkB,CAAC,MAAM,CAAC;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,iBAAiB,CAAC;CACpC;AAED,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,QAAQ,CAAC,EAAE,GAAG,CAAC;CAClB;AAED,MAAM,WAAW,qBAAsB,SAAQ,eAAe;IAC1D,IAAI,EAAE,OAAO,kBAAkB,CAAC,QAAQ,CAAC;IACzC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,WAAW,CAAC,EAAE,YAAY,CAAC;CAC9B;AAED,MAAM,WAAW,kBAAmB,SAAQ,eAAe;IACvD,IAAI,EAAE,OAAO,kBAAkB,CAAC,KAAK,CAAC;IACtC,GAAG,EAAE,iBAAiB,EAAE,CAAC;CAC5B;AAED,MAAM,WAAW,YAAY;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC/B;AAED,oBAAY,iBAAiB,GAAG,mBAAmB,GAAG,mBAAmB,GAAG,qBAAqB,CAAC;AAElG,oBAAY,YAAY,GAAG,iBAAiB,GAAG,kBAAkB,CAAC"}

package/lib/ops.js

@@ -11,14 +11,14 @@ export var ReferenceType;
     ReferenceType[ReferenceType["RangeBegin"] = 16] = "RangeBegin";
     ReferenceType[ReferenceType["RangeEnd"] = 32] = "RangeEnd";
     ReferenceType[ReferenceType["SlideOnRemove"] = 64] = "SlideOnRemove";
+    ReferenceType[ReferenceType["StayOnRemove"] = 128] = "StayOnRemove";
     ReferenceType[ReferenceType["Transient"] = 256] = "Transient";
 })(ReferenceType || (ReferenceType = {}));
 // Note: Assigned positive integers to avoid clashing with MergeTreeMaintenanceType
-export var MergeTreeDeltaType;
-(function (MergeTreeDeltaType) {
-    MergeTreeDeltaType[MergeTreeDeltaType["INSERT"] = 0] = "INSERT";
-    MergeTreeDeltaType[MergeTreeDeltaType["REMOVE"] = 1] = "REMOVE";
-    MergeTreeDeltaType[MergeTreeDeltaType["ANNOTATE"] = 2] = "ANNOTATE";
-    MergeTreeDeltaType[MergeTreeDeltaType["GROUP"] = 3] = "GROUP";
-})(MergeTreeDeltaType || (MergeTreeDeltaType = {}));
+export const MergeTreeDeltaType = {
+    INSERT: 0,
+    REMOVE: 1,
+    ANNOTATE: 2,
+    GROUP: 3,
+};
 //# sourceMappingURL=ops.js.map

package/lib/ops.js.map

@@ -1 +1 @@
-{"version":3,"file":"ops.js","sourceRoot":"","sources":["../src/ops.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,CAAN,IAAY,aASX;AATD,WAAY,aAAa;IACrB,qDAAY,CAAA;IACZ,iDAAU,CAAA;IACV,2DAAe,CAAA;IACf,uDAAa,CAAA;IACb,8DAAiB,CAAA;IACjB,0DAAe,CAAA;IACf,oEAAoB,CAAA;IACpB,6DAAiB,CAAA;AACrB,CAAC,EATW,aAAa,KAAb,aAAa,QASxB;AAMD,mFAAmF;AACnF,MAAM,CAAN,IAAkB,kBAKjB;AALD,WAAkB,kBAAkB;IAChC,+DAAU,CAAA;IACV,+DAAU,CAAA;IACV,mEAAY,CAAA;IACZ,6DAAS,CAAA;AACb,CAAC,EALiB,kBAAkB,KAAlB,kBAAkB,QAKnC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nexport enum ReferenceType {\n    Simple = 0x0,\n    Tile = 0x1,\n    NestBegin = 0x2,\n    NestEnd = 0x4,\n    RangeBegin = 0x10,\n    RangeEnd = 0x20,\n    SlideOnRemove = 0x40,\n    Transient = 0x100,\n}\n\nexport interface IMarkerDef {\n    refType?: ReferenceType;\n}\n\n// Note: Assigned positive integers to avoid clashing with MergeTreeMaintenanceType\nexport const enum MergeTreeDeltaType {\n    INSERT = 0,\n    REMOVE = 1,\n    ANNOTATE = 2,\n    GROUP = 3,\n}\n\nexport interface IMergeTreeDelta {\n    /**\n     * Type of this change.\n     */\n    type: MergeTreeDeltaType;\n}\n\n/**\n * A position specified relative to a segment.\n */\nexport interface IRelativePosition {\n    /**\n     * String identifier specifying a segment.\n     */\n    id?: string;\n    /**\n     * If true, insert before the specified segment.  If false or not defined,\n     * insert after the specified segment.\n     */\n    before?: boolean;\n    /**\n     * A positive number \\>= 1.  If before is false, offset is added to the position.\n     * If before is true, offset is subtracted from the position.\n     */\n    offset?: number;\n}\n\nexport interface IMergeTreeInsertMsg extends IMergeTreeDelta {\n    type: MergeTreeDeltaType.INSERT;\n    pos1?: number;\n    relativePos1?: IRelativePosition;\n    pos2?: number;\n    relativePos2?: IRelativePosition;\n    seg?: any;\n}\n\nexport interface IMergeTreeRemoveMsg extends IMergeTreeDelta {\n    type: MergeTreeDeltaType.REMOVE;\n    pos1?: number;\n    relativePos1?: IRelativePosition;\n    pos2?: number;\n    relativePos2?: IRelativePosition;\n}\n\nexport interface ICombiningOp {\n    name: string;\n    defaultValue?: any;\n    minValue?: any;\n    maxValue?: any;\n}\n\nexport interface IMergeTreeAnnotateMsg extends IMergeTreeDelta {\n    type: MergeTreeDeltaType.ANNOTATE;\n    pos1?: number;\n    relativePos1?: IRelativePosition;\n    pos2?: number;\n    relativePos2?: IRelativePosition;\n    props: Record<string, any>;\n    combiningOp?: ICombiningOp;\n}\n\nexport interface IMergeTreeGroupMsg extends IMergeTreeDelta {\n    type: MergeTreeDeltaType.GROUP;\n    ops: IMergeTreeDeltaOp[];\n}\n\nexport interface IJSONSegment {\n    props?: Record<string, any>;\n}\n\nexport type IMergeTreeDeltaOp = IMergeTreeInsertMsg | IMergeTreeRemoveMsg | IMergeTreeAnnotateMsg;\n\nexport type IMergeTreeOp = IMergeTreeDeltaOp | IMergeTreeGroupMsg;\n"]}
+{"version":3,"file":"ops.js","sourceRoot":"","sources":["../src/ops.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,CAAN,IAAY,aAUX;AAVD,WAAY,aAAa;IACrB,qDAAY,CAAA;IACZ,iDAAU,CAAA;IACV,2DAAe,CAAA;IACf,uDAAa,CAAA;IACb,8DAAiB,CAAA;IACjB,0DAAe,CAAA;IACf,oEAAoB,CAAA;IACpB,mEAAmB,CAAA;IACnB,6DAAiB,CAAA;AACrB,CAAC,EAVW,aAAa,KAAb,aAAa,QAUxB;AAMD,mFAAmF;AACnF,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAC9B,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,QAAQ,EAAE,CAAC;IACX,KAAK,EAAE,CAAC;CACF,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nexport enum ReferenceType {\n    Simple = 0x0,\n    Tile = 0x1,\n    NestBegin = 0x2,\n    NestEnd = 0x4,\n    RangeBegin = 0x10,\n    RangeEnd = 0x20,\n    SlideOnRemove = 0x40,\n    StayOnRemove = 0x80,\n    Transient = 0x100,\n}\n\nexport interface IMarkerDef {\n    refType?: ReferenceType;\n}\n\n// Note: Assigned positive integers to avoid clashing with MergeTreeMaintenanceType\nexport const MergeTreeDeltaType = {\n    INSERT: 0,\n    REMOVE: 1,\n    ANNOTATE: 2,\n    GROUP: 3,\n} as const;\n\nexport type MergeTreeDeltaType = typeof MergeTreeDeltaType[keyof typeof MergeTreeDeltaType];\n\nexport interface IMergeTreeDelta {\n    /**\n     * Type of this change.\n     */\n    type: MergeTreeDeltaType;\n}\n\n/**\n * A position specified relative to a segment.\n */\nexport interface IRelativePosition {\n    /**\n     * String identifier specifying a segment.\n     */\n    id?: string;\n    /**\n     * If true, insert before the specified segment.  If false or not defined,\n     * insert after the specified segment.\n     */\n    before?: boolean;\n    /**\n     * A positive number \\>= 1.  If before is false, offset is added to the position.\n     * If before is true, offset is subtracted from the position.\n     */\n    offset?: number;\n}\n\nexport interface IMergeTreeInsertMsg extends IMergeTreeDelta {\n    type: typeof MergeTreeDeltaType.INSERT;\n    pos1?: number;\n    relativePos1?: IRelativePosition;\n    pos2?: number;\n    relativePos2?: IRelativePosition;\n    seg?: any;\n}\n\nexport interface IMergeTreeRemoveMsg extends IMergeTreeDelta {\n    type: typeof MergeTreeDeltaType.REMOVE;\n    pos1?: number;\n    relativePos1?: IRelativePosition;\n    pos2?: number;\n    relativePos2?: IRelativePosition;\n}\n\nexport interface ICombiningOp {\n    name: string;\n    defaultValue?: any;\n    minValue?: any;\n    maxValue?: any;\n}\n\nexport interface IMergeTreeAnnotateMsg extends IMergeTreeDelta {\n    type: typeof MergeTreeDeltaType.ANNOTATE;\n    pos1?: number;\n    relativePos1?: IRelativePosition;\n    pos2?: number;\n    relativePos2?: IRelativePosition;\n    props: Record<string, any>;\n    combiningOp?: ICombiningOp;\n}\n\nexport interface IMergeTreeGroupMsg extends IMergeTreeDelta {\n    type: typeof MergeTreeDeltaType.GROUP;\n    ops: IMergeTreeDeltaOp[];\n}\n\nexport interface IJSONSegment {\n    props?: Record<string, any>;\n}\n\nexport type IMergeTreeDeltaOp = IMergeTreeInsertMsg | IMergeTreeRemoveMsg | IMergeTreeAnnotateMsg;\n\nexport type IMergeTreeOp = IMergeTreeDeltaOp | IMergeTreeGroupMsg;\n"]}

package/lib/referencePositions.d.ts

@@ -8,7 +8,7 @@ import { ReferenceType, ICombiningOp } from "./ops";
 import { PropertySet, MapLike } from "./properties";
 export declare const reservedTileLabelsKey = "referenceTileLabels";
 export declare const reservedRangeLabelsKey = "referenceRangeLabels";
-export declare function refTypeIncludesFlag(refPos: ReferencePosition, flags: ReferenceType): boolean;
+export declare function refTypeIncludesFlag(refPosOrType: ReferencePosition | ReferenceType, flags: ReferenceType): boolean;
 export declare const refGetTileLabels: (refPos: ReferencePosition) => string[] | undefined;
 export declare const refGetRangeLabels: (refPos: ReferencePosition) => string[] | undefined;
 export declare function refHasTileLabel(refPos: ReferencePosition, label: string): boolean;

package/lib/referencePositions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"referencePositions.d.ts","sourceRoot":"","sources":["../src/referencePositions.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEpD,eAAO,MAAM,qBAAqB,wBAAwB,CAAC;AAC3D,eAAO,MAAM,sBAAsB,yBAAyB,CAAC;AAE7D,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAG5F;AAED,eAAO,MAAM,gBAAgB,WAAY,iBAAiB,KAAG,MAAM,EAAE,GAAG,SAEuB,CAAC;AAEhG,eAAO,MAAM,iBAAiB,WAAY,iBAAiB,KAAG,MAAM,EAAE,GAAG,SAGuB,CAAC;AAEjG,wBAAgB,eAAe,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAUjF;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAUlF;AACD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAEnE;AACD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAEpE;AAED,MAAM,WAAW,iBAAiB;IAC9B,UAAU,CAAC,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,aAAa,CAAC;IAEvB,UAAU,IAAI,QAAQ,GAAG,SAAS,CAAC;IACnC,SAAS,IAAI,MAAM,CAAC;IACpB,aAAa,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IAC9D,MAAM,IAAI,OAAO,CAAC;IAElB;;OAEG;IACH,aAAa,IAAI,OAAO,CAAC;IACzB;;OAEG;IACH,cAAc,IAAI,OAAO,CAAC;IAC1B;;OAEG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IACrC;;OAEG;IACH,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IACtC;;OAEG;IACH,aAAa,IAAI,MAAM,EAAE,GAAG,SAAS,CAAC;IACtC;;OAEG;IACH,cAAc,IAAI,MAAM,EAAE,GAAG,SAAS,CAAC;CAC1C;AAED,oBAAY,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;AAC9D,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAE5C,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,iBAAiB,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAM/E;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,iBAAiB,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAM/E;AAED,wBAAgB,yBAAyB,CAAC,CAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE,iBAAiB,GAAG,MAAM,CAc5F"}
+{"version":3,"file":"referencePositions.d.ts","sourceRoot":"","sources":["../src/referencePositions.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEpD,eAAO,MAAM,qBAAqB,wBAAwB,CAAC;AAC3D,eAAO,MAAM,sBAAsB,yBAAyB,CAAC;AAE7D,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,iBAAiB,GAAG,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAIlH;AAED,eAAO,MAAM,gBAAgB,WAAY,iBAAiB,KAAG,MAAM,EAAE,GAAG,SAEuB,CAAC;AAEhG,eAAO,MAAM,iBAAiB,WAAY,iBAAiB,KAAG,MAAM,EAAE,GAAG,SAGuB,CAAC;AAEjG,wBAAgB,eAAe,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAUjF;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAUlF;AACD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAEnE;AACD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAEpE;AAED,MAAM,WAAW,iBAAiB;IAC9B,UAAU,CAAC,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,aAAa,CAAC;IAEvB,UAAU,IAAI,QAAQ,GAAG,SAAS,CAAC;IACnC,SAAS,IAAI,MAAM,CAAC;IACpB,aAAa,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IAC9D,MAAM,IAAI,OAAO,CAAC;IAElB;;OAEG;IACH,aAAa,IAAI,OAAO,CAAC;IACzB;;OAEG;IACH,cAAc,IAAI,OAAO,CAAC;IAC1B;;OAEG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IACrC;;OAEG;IACH,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IACtC;;OAEG;IACH,aAAa,IAAI,MAAM,EAAE,GAAG,SAAS,CAAC;IACtC;;OAEG;IACH,cAAc,IAAI,MAAM,EAAE,GAAG,SAAS,CAAC;CAC1C;AAED,oBAAY,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;AAC9D,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAE5C,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,iBAAiB,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAM/E;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,iBAAiB,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAM/E;AAED,wBAAgB,yBAAyB,CAAC,CAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE,iBAAiB,GAAG,MAAM,CAc5F"}

package/lib/referencePositions.js

@@ -5,9 +5,10 @@
 import { ReferenceType } from "./ops";
 export const reservedTileLabelsKey = "referenceTileLabels";
 export const reservedRangeLabelsKey = "referenceRangeLabels";
-export function refTypeIncludesFlag(refPos, flags) {
+export function refTypeIncludesFlag(refPosOrType, flags) {
+    const refType = typeof refPosOrType === "number" ? refPosOrType : refPosOrType.refType;
     // eslint-disable-next-line no-bitwise
-    return (refPos.refType & flags) !== 0;
+    return (refType & flags) !== 0;
 }
 export const refGetTileLabels = (refPos) => refTypeIncludesFlag(refPos, ReferenceType.Tile)
     && refPos.properties ? refPos.properties[reservedTileLabelsKey] : undefined;

package/lib/referencePositions.js.map

@@ -1 +1 @@
-{"version":3,"file":"referencePositions.js","sourceRoot":"","sources":["../src/referencePositions.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 { Stack } from \"./collections\";\nimport { ISegment } from \"./mergeTree\";\nimport { ReferenceType, ICombiningOp } from \"./ops\";\nimport { PropertySet, MapLike } from \"./properties\";\n\nexport const reservedTileLabelsKey = \"referenceTileLabels\";\nexport const reservedRangeLabelsKey = \"referenceRangeLabels\";\n\nexport function refTypeIncludesFlag(refPos: ReferencePosition, flags: ReferenceType): boolean {\n    // eslint-disable-next-line no-bitwise\n    return (refPos.refType & flags) !== 0;\n}\n\nexport const refGetTileLabels = (refPos: ReferencePosition): string[] | undefined =>\n    refTypeIncludesFlag(refPos, ReferenceType.Tile)\n        && refPos.properties ? refPos.properties[reservedTileLabelsKey] as string[] : undefined;\n\nexport const refGetRangeLabels = (refPos: ReferencePosition): string[] | undefined =>\n    // eslint-disable-next-line no-bitwise\n    (refTypeIncludesFlag(refPos, ReferenceType.NestBegin | ReferenceType.NestEnd))\n        && refPos.properties ? refPos.properties[reservedRangeLabelsKey] as string[] : undefined;\n\nexport function refHasTileLabel(refPos: ReferencePosition, label: string): boolean {\n    const tileLabels = refGetTileLabels(refPos);\n    if (tileLabels) {\n        for (const refLabel of tileLabels) {\n            if (label === refLabel) {\n                return true;\n            }\n        }\n    }\n    return false;\n}\n\nexport function refHasRangeLabel(refPos: ReferencePosition, label: string): boolean {\n    const rangeLabels = refGetRangeLabels(refPos);\n    if (rangeLabels) {\n        for (const refLabel of rangeLabels) {\n            if (label === refLabel) {\n                return true;\n            }\n        }\n    }\n    return false;\n}\nexport function refHasTileLabels(refPos: ReferencePosition): boolean {\n    return refGetTileLabels(refPos) !== undefined;\n}\nexport function refHasRangeLabels(refPos: ReferencePosition): boolean {\n    return refGetRangeLabels(refPos) !== undefined;\n}\n\nexport interface ReferencePosition {\n    properties?: PropertySet;\n    refType: ReferenceType;\n\n    getSegment(): ISegment | undefined;\n    getOffset(): number;\n    addProperties(newProps: PropertySet, op?: ICombiningOp): void;\n    isLeaf(): boolean;\n\n    /**\n     * @deprecated - use refHasTileLabels\n     */\n    hasTileLabels(): boolean;\n    /**\n     * @deprecated - use refHasRangeLabels\n     */\n    hasRangeLabels(): boolean;\n    /**\n     * @deprecated - use refHasTileLabel\n     */\n    hasTileLabel(label: string): boolean;\n    /**\n     * @deprecated - use refHasRangeLabel\n     */\n    hasRangeLabel(label: string): boolean;\n    /**\n     * @deprecated - use refGetTileLabels\n     */\n    getTileLabels(): string[] | undefined;\n    /**\n     * @deprecated - use refGetRangeLabels\n     */\n    getRangeLabels(): string[] | undefined;\n}\n\nexport type RangeStackMap = MapLike<Stack<ReferencePosition>>;\nexport const DetachedReferencePosition = -1;\n\nexport function minReferencePosition<T extends ReferencePosition>(a: T, b: T): T {\n    if (compareReferencePositions(a, b) < 0) {\n        return a;\n    } else {\n        return b;\n    }\n}\n\nexport function maxReferencePosition<T extends ReferencePosition>(a: T, b: T): T {\n    if (compareReferencePositions(a, b) > 0) {\n        return a;\n    } else {\n        return b;\n    }\n}\n\nexport function compareReferencePositions(a: ReferencePosition, b: ReferencePosition): number {\n    const aSeg = a.getSegment();\n    const bSeg = b.getSegment();\n    if (aSeg === bSeg) {\n        return a.getOffset() - b.getOffset();\n    } else {\n        if (aSeg === undefined\n            || (bSeg !== undefined &&\n                aSeg.ordinal < bSeg.ordinal)) {\n            return -1;\n        } else {\n            return 1;\n        }\n    }\n}\n"]}
+{"version":3,"file":"referencePositions.js","sourceRoot":"","sources":["../src/referencePositions.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 { Stack } from \"./collections\";\nimport { ISegment } from \"./mergeTree\";\nimport { ReferenceType, ICombiningOp } from \"./ops\";\nimport { PropertySet, MapLike } from \"./properties\";\n\nexport const reservedTileLabelsKey = \"referenceTileLabels\";\nexport const reservedRangeLabelsKey = \"referenceRangeLabels\";\n\nexport function refTypeIncludesFlag(refPosOrType: ReferencePosition | ReferenceType, flags: ReferenceType): boolean {\n    const refType = typeof refPosOrType === \"number\" ? refPosOrType : refPosOrType.refType;\n    // eslint-disable-next-line no-bitwise\n    return (refType & flags) !== 0;\n}\n\nexport const refGetTileLabels = (refPos: ReferencePosition): string[] | undefined =>\n    refTypeIncludesFlag(refPos, ReferenceType.Tile)\n        && refPos.properties ? refPos.properties[reservedTileLabelsKey] as string[] : undefined;\n\nexport const refGetRangeLabels = (refPos: ReferencePosition): string[] | undefined =>\n    // eslint-disable-next-line no-bitwise\n    (refTypeIncludesFlag(refPos, ReferenceType.NestBegin | ReferenceType.NestEnd))\n        && refPos.properties ? refPos.properties[reservedRangeLabelsKey] as string[] : undefined;\n\nexport function refHasTileLabel(refPos: ReferencePosition, label: string): boolean {\n    const tileLabels = refGetTileLabels(refPos);\n    if (tileLabels) {\n        for (const refLabel of tileLabels) {\n            if (label === refLabel) {\n                return true;\n            }\n        }\n    }\n    return false;\n}\n\nexport function refHasRangeLabel(refPos: ReferencePosition, label: string): boolean {\n    const rangeLabels = refGetRangeLabels(refPos);\n    if (rangeLabels) {\n        for (const refLabel of rangeLabels) {\n            if (label === refLabel) {\n                return true;\n            }\n        }\n    }\n    return false;\n}\nexport function refHasTileLabels(refPos: ReferencePosition): boolean {\n    return refGetTileLabels(refPos) !== undefined;\n}\nexport function refHasRangeLabels(refPos: ReferencePosition): boolean {\n    return refGetRangeLabels(refPos) !== undefined;\n}\n\nexport interface ReferencePosition {\n    properties?: PropertySet;\n    refType: ReferenceType;\n\n    getSegment(): ISegment | undefined;\n    getOffset(): number;\n    addProperties(newProps: PropertySet, op?: ICombiningOp): void;\n    isLeaf(): boolean;\n\n    /**\n     * @deprecated - use refHasTileLabels\n     */\n    hasTileLabels(): boolean;\n    /**\n     * @deprecated - use refHasRangeLabels\n     */\n    hasRangeLabels(): boolean;\n    /**\n     * @deprecated - use refHasTileLabel\n     */\n    hasTileLabel(label: string): boolean;\n    /**\n     * @deprecated - use refHasRangeLabel\n     */\n    hasRangeLabel(label: string): boolean;\n    /**\n     * @deprecated - use refGetTileLabels\n     */\n    getTileLabels(): string[] | undefined;\n    /**\n     * @deprecated - use refGetRangeLabels\n     */\n    getRangeLabels(): string[] | undefined;\n}\n\nexport type RangeStackMap = MapLike<Stack<ReferencePosition>>;\nexport const DetachedReferencePosition = -1;\n\nexport function minReferencePosition<T extends ReferencePosition>(a: T, b: T): T {\n    if (compareReferencePositions(a, b) < 0) {\n        return a;\n    } else {\n        return b;\n    }\n}\n\nexport function maxReferencePosition<T extends ReferencePosition>(a: T, b: T): T {\n    if (compareReferencePositions(a, b) > 0) {\n        return a;\n    } else {\n        return b;\n    }\n}\n\nexport function compareReferencePositions(a: ReferencePosition, b: ReferencePosition): number {\n    const aSeg = a.getSegment();\n    const bSeg = b.getSegment();\n    if (aSeg === bSeg) {\n        return a.getOffset() - b.getOffset();\n    } else {\n        if (aSeg === undefined\n            || (bSeg !== undefined &&\n                aSeg.ordinal < bSeg.ordinal)) {\n            return -1;\n        } else {\n            return 1;\n        }\n    }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/merge-tree",
-  "version": "0.59.4002",
+  "version": "1.0.2",
   "description": "Merge tree",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -61,46 +61,34 @@
   "dependencies": {
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/common-utils": "^0.32.1",
-    "@fluidframework/container-definitions": "^0.48.2000",
-    "@fluidframework/core-interfaces": "^0.43.1000",
-    "@fluidframework/datastore-definitions": "^0.59.4002",
+    "@fluidframework/container-definitions": "^1.0.2",
+    "@fluidframework/container-utils": "^1.0.2",
+    "@fluidframework/core-interfaces": "^1.0.2",
+    "@fluidframework/datastore-definitions": "^1.0.2",
     "@fluidframework/protocol-definitions": "^0.1028.2000",
-    "@fluidframework/runtime-definitions": "^0.59.4002",
-    "@fluidframework/runtime-utils": "^0.59.4002",
-    "@fluidframework/shared-object-base": "^0.59.4002",
-    "@fluidframework/telemetry-utils": "^0.59.4002"
+    "@fluidframework/runtime-definitions": "^1.0.2",
+    "@fluidframework/runtime-utils": "^1.0.2",
+    "@fluidframework/shared-object-base": "^1.0.2",
+    "@fluidframework/telemetry-utils": "^1.0.2"
   },
   "devDependencies": {
     "@fluidframework/build-common": "^0.23.0",
-    "@fluidframework/build-tools": "^0.2.70857",
+    "@fluidframework/build-tools": "^0.2.71273",
     "@fluidframework/eslint-config-fluid": "^0.28.2000",
-    "@fluidframework/merge-tree-previous": "npm:@fluidframework/merge-tree@0.59.4001",
-    "@fluidframework/mocha-test-setup": "^0.59.4002",
-    "@fluidframework/test-runtime-utils": "^0.59.4002",
+    "@fluidframework/merge-tree-previous": "npm:@fluidframework/merge-tree@^0.58.0",
+    "@fluidframework/mocha-test-setup": "^1.0.2",
+    "@fluidframework/test-runtime-utils": "^1.0.2",
     "@microsoft/api-extractor": "^7.22.2",
     "@rushstack/eslint-config": "^2.5.1",
     "@types/diff": "^3.5.1",
     "@types/mocha": "^9.1.1",
     "@types/node": "^14.18.0",
     "@types/random-js": "^1.0.31",
-    "@typescript-eslint/eslint-plugin": "~5.9.0",
-    "@typescript-eslint/parser": "~5.9.0",
     "concurrently": "^6.2.0",
     "copyfiles": "^2.1.0",
     "cross-env": "^7.0.2",
     "diff": "^3.5.0",
     "eslint": "~8.6.0",
-    "eslint-plugin-editorconfig": "~3.2.0",
-    "eslint-plugin-eslint-comments": "~3.2.0",
-    "eslint-plugin-import": "~2.25.4",
-    "eslint-plugin-jest": "~26.1.3",
-    "eslint-plugin-jsdoc": "~39.3.0",
-    "eslint-plugin-mocha": "~10.0.3",
-    "eslint-plugin-promise": "~6.0.0",
-    "eslint-plugin-react": "~7.28.0",
-    "eslint-plugin-tsdoc": "~0.2.14",
-    "eslint-plugin-unicorn": "~40.0.0",
-    "eslint-plugin-unused-imports": "~2.0.0",
     "mocha": "^10.0.0",
     "nyc": "^15.0.0",
     "random-js": "^1.0.8",
@@ -110,74 +98,81 @@
     "typescript-formatter": "7.1.0"
   },
   "typeValidation": {
-    "version": "0.59.4002",
+    "version": "1.0.0",
     "broken": {
-      "InterfaceDeclaration_IMergeTreeAnnotateMsg": {
-        "forwardCompat": false,
-        "backCompat": false
+      "ClassDeclaration_BaseSegment": {
+        "forwardCompat": false
       },
-      "InterfaceDeclaration_IMergeTreeDelta": {
-        "forwardCompat": false,
-        "backCompat": false
+      "ClassDeclaration_Client": {
+        "forwardCompat": false
       },
-      "InterfaceDeclaration_IMergeTreeDeltaCallbackArgs": {
-        "forwardCompat": false,
-        "backCompat": false
+      "InterfaceDeclaration_IConsensusInfo": {
+        "backCompat": false,
+        "forwardCompat": false
       },
-      "TypeAliasDeclaration_IMergeTreeDeltaOp": {
-        "forwardCompat": false,
-        "backCompat": false
+      "InterfaceDeclaration_IHierBlock": {
+        "forwardCompat": false
       },
-      "InterfaceDeclaration_IMergeTreeDeltaOpArgs": {
-        "forwardCompat": false,
-        "backCompat": false
+      "InterfaceDeclaration_IMergeBlock": {
+        "forwardCompat": false
       },
-      "InterfaceDeclaration_IMergeTreeGroupMsg": {
-        "forwardCompat": false,
-        "backCompat": false
+      "TypeAliasDeclaration_IMergeNode": {
+        "forwardCompat": false
       },
-      "InterfaceDeclaration_IMergeTreeInsertMsg": {
-        "forwardCompat": false,
-        "backCompat": false
+      "InterfaceDeclaration_IMergeNodeCommon": {
+        "forwardCompat": false
       },
-      "InterfaceDeclaration_IMergeTreeMaintenanceCallbackArgs": {
-        "forwardCompat": false,
-        "backCompat": false
+      "ClassDeclaration_IncrementalMapState": {
+        "forwardCompat": false
       },
-      "TypeAliasDeclaration_IMergeTreeOp": {
-        "forwardCompat": false,
-        "backCompat": false
+      "InterfaceDeclaration_InsertContext": {
+        "forwardCompat": false
       },
-      "InterfaceDeclaration_IMergeTreeRemoveMsg": {
-        "forwardCompat": false,
-        "backCompat": false
+      "InterfaceDeclaration_IRemovalInfo": {
+        "forwardCompat": false
       },
-      "TypeAliasDeclaration_IntervalNode": {
-        "forwardCompat": false,
-        "backCompat": false
+      "InterfaceDeclaration_ISegmentChanges": {
+        "forwardCompat": false
       },
-      "TypeAliasDeclaration_MergeTreeDeltaOperationType": {
-        "forwardCompat": false,
-        "backCompat": false
+      "ClassDeclaration_LocalReference": {
+        "backCompat": false,
+        "forwardCompat": false
       },
-      "TypeAliasDeclaration_MergeTreeDeltaOperationTypes": {
-        "forwardCompat": false,
-        "backCompat": false
+      "ClassDeclaration_LocalReferenceCollection": {
+        "forwardCompat": false
       },
-      "EnumDeclaration_MergeTreeDeltaType": {
-        "forwardCompat": false,
-        "backCompat": false
+      "InterfaceDeclaration_LRUSegment": {
+        "forwardCompat": false
+      },
+      "ClassDeclaration_Marker": {
+        "backCompat": false,
+        "forwardCompat": false
+      },
+      "ClassDeclaration_MergeBlock": {
+        "forwardCompat": false
+      },
+      "ClassDeclaration_MergeNode": {
+        "forwardCompat": false
+      },
+      "ClassDeclaration_MergeTree": {
+        "forwardCompat": false
+      },
+      "ClassDeclaration_SnapshotLegacy": {
+        "forwardCompat": false
+      },
+      "ClassDeclaration_TextSegment": {
+        "forwardCompat": false
+      },
+      "ClassDeclaration_List": {
+        "forwardCompat": false
       },
-      "EnumDeclaration_MergeTreeMaintenanceType": {
-        "forwardCompat": false,
+      "InterfaceDeclaration_IJSONMarkerSegment": {
         "backCompat": false
       },
-      "EnumDeclaration_RBColor": {
-        "forwardCompat": false,
+      "InterfaceDeclaration_IMarkerDef": {
         "backCompat": false
       },
-      "InterfaceDeclaration_RBNode": {
-        "forwardCompat": false,
+      "EnumDeclaration_ReferenceType": {
         "backCompat": false
       }
     }