@fluidframework/merge-tree 2.32.0 → 2.33.0

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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # @fluidframework/merge-tree
2
2
 
3
+ ## 2.33.0
4
+
5
+ Dependency updates only.
6
+
3
7
  ## 2.32.0
4
8
 
5
9
  Dependency updates only.
@@ -4,17 +4,17 @@
4
4
 
5
5
  ```ts
6
6
 
7
- // @alpha
7
+ // @alpha @legacy
8
8
  export interface AdjustParams {
9
9
  delta: number;
10
10
  max?: number | undefined;
11
11
  min?: number | undefined;
12
12
  }
13
13
 
14
- // @alpha
14
+ // @alpha @legacy
15
15
  export function appendToMergeTreeDeltaRevertibles(deltaArgs: IMergeTreeDeltaCallbackArgs, revertibles: MergeTreeDeltaRevertible[]): void;
16
16
 
17
- // @alpha (undocumented)
17
+ // @alpha @legacy (undocumented)
18
18
  export abstract class BaseSegment implements ISegment {
19
19
  constructor(properties?: PropertySet);
20
20
  // (undocumented)
@@ -49,10 +49,10 @@ export abstract class BaseSegment implements ISegment {
49
49
  abstract readonly type: string;
50
50
  }
51
51
 
52
- // @alpha
52
+ // @alpha @legacy
53
53
  export function discardMergeTreeDeltaRevertible(revertibles: MergeTreeDeltaRevertible[]): void;
54
54
 
55
- // @alpha
55
+ // @alpha @legacy
56
56
  export function endpointPosAndSide(start: SequencePlace | undefined, end: SequencePlace | undefined): {
57
57
  startSide: Side | undefined;
58
58
  endSide: Side | undefined;
@@ -60,7 +60,7 @@ export function endpointPosAndSide(start: SequencePlace | undefined, end: Sequen
60
60
  endPos: number | "start" | "end" | undefined;
61
61
  };
62
62
 
63
- // @alpha (undocumented)
63
+ // @alpha @legacy (undocumented)
64
64
  export interface IAttributionCollection<T> {
65
65
  // (undocumented)
66
66
  append(other: IAttributionCollection<T>): void;
@@ -80,7 +80,7 @@ export interface IAttributionCollection<T> {
80
80
  update(name: string | undefined, channel: IAttributionCollection<T>): void;
81
81
  }
82
82
 
83
- // @alpha @sealed (undocumented)
83
+ // @alpha @sealed @legacy (undocumented)
84
84
  export interface IAttributionCollectionSerializer {
85
85
  populateAttributionCollections(segments: Iterable<ISegment>, summary: SerializedAttributionCollection): void;
86
86
  // (undocumented)
@@ -90,7 +90,7 @@ export interface IAttributionCollectionSerializer {
90
90
  }>): SerializedAttributionCollection;
91
91
  }
92
92
 
93
- // @alpha (undocumented)
93
+ // @alpha @legacy (undocumented)
94
94
  export interface IAttributionCollectionSpec<T> {
95
95
  // (undocumented)
96
96
  channels?: {
@@ -108,31 +108,31 @@ export interface IAttributionCollectionSpec<T> {
108
108
  }>;
109
109
  }
110
110
 
111
- // @alpha (undocumented)
111
+ // @alpha @legacy (undocumented)
112
112
  export interface IJSONMarkerSegment extends IJSONSegment {
113
113
  // (undocumented)
114
114
  marker: IMarkerDef;
115
115
  }
116
116
 
117
- // @alpha (undocumented)
117
+ // @alpha @legacy (undocumented)
118
118
  export interface IJSONSegment {
119
119
  // (undocumented)
120
120
  props?: Record<string, any>;
121
121
  }
122
122
 
123
- // @alpha (undocumented)
123
+ // @alpha @legacy (undocumented)
124
124
  export interface IJSONTextSegment extends IJSONSegment {
125
125
  // (undocumented)
126
126
  text: string;
127
127
  }
128
128
 
129
- // @alpha (undocumented)
129
+ // @alpha @legacy (undocumented)
130
130
  export interface IMarkerDef {
131
131
  // (undocumented)
132
132
  refType?: ReferenceType;
133
133
  }
134
134
 
135
- // @alpha (undocumented)
135
+ // @alpha @legacy (undocumented)
136
136
  export interface IMergeTreeAnnotateAdjustMsg extends IMergeTreeDelta {
137
137
  // (undocumented)
138
138
  adjust: Record<string, AdjustParams>;
@@ -150,7 +150,7 @@ export interface IMergeTreeAnnotateAdjustMsg extends IMergeTreeDelta {
150
150
  type: typeof MergeTreeDeltaType.ANNOTATE;
151
151
  }
152
152
 
153
- // @alpha (undocumented)
153
+ // @alpha @legacy (undocumented)
154
154
  export interface IMergeTreeAnnotateMsg extends IMergeTreeDelta {
155
155
  // (undocumented)
156
156
  adjust?: never;
@@ -168,21 +168,21 @@ export interface IMergeTreeAnnotateMsg extends IMergeTreeDelta {
168
168
  type: typeof MergeTreeDeltaType.ANNOTATE;
169
169
  }
170
170
 
171
- // @alpha (undocumented)
171
+ // @alpha @legacy (undocumented)
172
172
  export interface IMergeTreeDelta {
173
173
  type: MergeTreeDeltaType;
174
174
  }
175
175
 
176
- // @alpha (undocumented)
176
+ // @alpha @legacy (undocumented)
177
177
  export interface IMergeTreeDeltaCallbackArgs<TOperationType extends MergeTreeDeltaOperationTypes = MergeTreeDeltaOperationType> {
178
178
  readonly deltaSegments: IMergeTreeSegmentDelta[];
179
179
  readonly operation: TOperationType;
180
180
  }
181
181
 
182
- // @alpha (undocumented)
182
+ // @alpha @legacy (undocumented)
183
183
  export type IMergeTreeDeltaOp = IMergeTreeInsertMsg | IMergeTreeRemoveMsg | IMergeTreeAnnotateMsg | IMergeTreeAnnotateAdjustMsg | IMergeTreeObliterateMsg | IMergeTreeObliterateSidedMsg;
184
184
 
185
- // @alpha (undocumented)
185
+ // @alpha @legacy (undocumented)
186
186
  export interface IMergeTreeDeltaOpArgs {
187
187
  readonly groupOp?: IMergeTreeGroupMsg;
188
188
  readonly op: IMergeTreeOp;
@@ -190,7 +190,7 @@ export interface IMergeTreeDeltaOpArgs {
190
190
  readonly sequencedMessage?: ISequencedDocumentMessage;
191
191
  }
192
192
 
193
- // @alpha @deprecated (undocumented)
193
+ // @alpha @deprecated @legacy (undocumented)
194
194
  export interface IMergeTreeGroupMsg extends IMergeTreeDelta {
195
195
  // (undocumented)
196
196
  ops: IMergeTreeDeltaOp[];
@@ -198,7 +198,7 @@ export interface IMergeTreeGroupMsg extends IMergeTreeDelta {
198
198
  type: typeof MergeTreeDeltaType.GROUP;
199
199
  }
200
200
 
201
- // @alpha (undocumented)
201
+ // @alpha @legacy (undocumented)
202
202
  export interface IMergeTreeInsertMsg extends IMergeTreeDelta {
203
203
  // (undocumented)
204
204
  pos1?: number;
@@ -214,11 +214,11 @@ export interface IMergeTreeInsertMsg extends IMergeTreeDelta {
214
214
  type: typeof MergeTreeDeltaType.INSERT;
215
215
  }
216
216
 
217
- // @alpha (undocumented)
217
+ // @alpha @legacy (undocumented)
218
218
  export interface IMergeTreeMaintenanceCallbackArgs extends IMergeTreeDeltaCallbackArgs<MergeTreeMaintenanceType> {
219
219
  }
220
220
 
221
- // @alpha @deprecated (undocumented)
221
+ // @alpha @deprecated @legacy (undocumented)
222
222
  export interface IMergeTreeObliterateMsg extends IMergeTreeDelta {
223
223
  // (undocumented)
224
224
  pos1?: number;
@@ -230,7 +230,7 @@ export interface IMergeTreeObliterateMsg extends IMergeTreeDelta {
230
230
  type: typeof MergeTreeDeltaType.OBLITERATE;
231
231
  }
232
232
 
233
- // @alpha (undocumented)
233
+ // @alpha @legacy (undocumented)
234
234
  export interface IMergeTreeObliterateSidedMsg extends IMergeTreeDelta {
235
235
  // (undocumented)
236
236
  pos1: {
@@ -248,10 +248,10 @@ export interface IMergeTreeObliterateSidedMsg extends IMergeTreeDelta {
248
248
  type: typeof MergeTreeDeltaType.OBLITERATE_SIDED;
249
249
  }
250
250
 
251
- // @alpha (undocumented)
251
+ // @alpha @legacy (undocumented)
252
252
  export type IMergeTreeOp = IMergeTreeDeltaOp | IMergeTreeGroupMsg;
253
253
 
254
- // @alpha (undocumented)
254
+ // @alpha @legacy (undocumented)
255
255
  export interface IMergeTreeOptions {
256
256
  // (undocumented)
257
257
  catchUpBlobName?: string;
@@ -265,7 +265,7 @@ export interface IMergeTreeOptions {
265
265
  newMergeTreeSnapshotFormat?: boolean;
266
266
  }
267
267
 
268
- // @alpha (undocumented)
268
+ // @alpha @legacy (undocumented)
269
269
  export interface IMergeTreeRemoveMsg extends IMergeTreeDelta {
270
270
  // (undocumented)
271
271
  pos1?: number;
@@ -279,13 +279,13 @@ export interface IMergeTreeRemoveMsg extends IMergeTreeDelta {
279
279
  type: typeof MergeTreeDeltaType.REMOVE;
280
280
  }
281
281
 
282
- // @alpha (undocumented)
282
+ // @alpha @legacy (undocumented)
283
283
  export interface IMergeTreeSegmentDelta {
284
284
  propertyDeltas?: PropertySet;
285
285
  segment: ISegment;
286
286
  }
287
287
 
288
- // @alpha
288
+ // @alpha @legacy
289
289
  export interface InteriorSequencePlace {
290
290
  // (undocumented)
291
291
  pos: number;
@@ -293,14 +293,14 @@ export interface InteriorSequencePlace {
293
293
  side: Side;
294
294
  }
295
295
 
296
- // @alpha
296
+ // @alpha @legacy
297
297
  export interface IRelativePosition {
298
298
  before?: boolean;
299
299
  id?: string;
300
300
  offset?: number;
301
301
  }
302
302
 
303
- // @alpha
303
+ // @alpha @legacy
304
304
  export interface ISegment {
305
305
  // (undocumented)
306
306
  append(segment: ISegment): void;
@@ -323,13 +323,13 @@ export interface ISegment {
323
323
  readonly type: string;
324
324
  }
325
325
 
326
- // @alpha (undocumented)
326
+ // @alpha @legacy (undocumented)
327
327
  export interface ISegmentAction<TClientData> {
328
328
  // (undocumented)
329
329
  (segment: ISegment, pos: number, refSeq: number, clientId: number, start: number, end: number, accum: TClientData): boolean;
330
330
  }
331
331
 
332
- // @alpha (undocumented)
332
+ // @alpha @legacy (undocumented)
333
333
  export interface ITrackingGroup {
334
334
  // (undocumented)
335
335
  has(trackable: Trackable): boolean;
@@ -343,7 +343,7 @@ export interface ITrackingGroup {
343
343
  unlink(trackable: Trackable): boolean;
344
344
  }
345
345
 
346
- // @alpha @sealed (undocumented)
346
+ // @alpha @sealed @legacy (undocumented)
347
347
  export interface LocalReferencePosition extends ReferencePosition {
348
348
  // (undocumented)
349
349
  addProperties(newProps: PropertySet): void;
@@ -354,13 +354,13 @@ export interface LocalReferencePosition extends ReferencePosition {
354
354
  readonly trackingCollection: TrackingGroupCollection;
355
355
  }
356
356
 
357
- // @alpha
357
+ // @alpha @legacy
358
358
  export interface MapLike<T> {
359
359
  // (undocumented)
360
360
  [index: string]: T;
361
361
  }
362
362
 
363
- // @alpha
363
+ // @alpha @legacy
364
364
  export class Marker extends BaseSegment implements ReferencePosition, ISegment {
365
365
  constructor(refType: ReferenceType, props?: PropertySet);
366
366
  // (undocumented)
@@ -397,13 +397,13 @@ export class Marker extends BaseSegment implements ReferencePosition, ISegment {
397
397
  readonly type = "Marker";
398
398
  }
399
399
 
400
- // @alpha (undocumented)
400
+ // @alpha @legacy (undocumented)
401
401
  export type MergeTreeDeltaOperationType = typeof MergeTreeDeltaType.ANNOTATE | typeof MergeTreeDeltaType.INSERT | typeof MergeTreeDeltaType.REMOVE | typeof MergeTreeDeltaType.OBLITERATE;
402
402
 
403
- // @alpha (undocumented)
403
+ // @alpha @legacy (undocumented)
404
404
  export type MergeTreeDeltaOperationTypes = MergeTreeDeltaOperationType | MergeTreeMaintenanceType;
405
405
 
406
- // @alpha (undocumented)
406
+ // @alpha @legacy (undocumented)
407
407
  export type MergeTreeDeltaRevertible = {
408
408
  operation: typeof MergeTreeDeltaType.INSERT;
409
409
  trackingGroup: ITrackingGroup;
@@ -416,7 +416,7 @@ export type MergeTreeDeltaRevertible = {
416
416
  propertyDeltas: PropertySet;
417
417
  };
418
418
 
419
- // @alpha (undocumented)
419
+ // @alpha @legacy (undocumented)
420
420
  export const MergeTreeDeltaType: {
421
421
  readonly INSERT: 0;
422
422
  readonly REMOVE: 1;
@@ -426,10 +426,10 @@ export const MergeTreeDeltaType: {
426
426
  readonly OBLITERATE_SIDED: 5;
427
427
  };
428
428
 
429
- // @alpha (undocumented)
429
+ // @alpha @legacy (undocumented)
430
430
  export type MergeTreeDeltaType = (typeof MergeTreeDeltaType)[keyof typeof MergeTreeDeltaType];
431
431
 
432
- // @alpha
432
+ // @alpha @legacy
433
433
  export const MergeTreeMaintenanceType: {
434
434
  readonly APPEND: -1;
435
435
  readonly SPLIT: -2;
@@ -437,10 +437,10 @@ export const MergeTreeMaintenanceType: {
437
437
  readonly ACKNOWLEDGED: -4;
438
438
  };
439
439
 
440
- // @alpha (undocumented)
440
+ // @alpha @legacy (undocumented)
441
441
  export type MergeTreeMaintenanceType = (typeof MergeTreeMaintenanceType)[keyof typeof MergeTreeMaintenanceType];
442
442
 
443
- // @alpha (undocumented)
443
+ // @alpha @legacy (undocumented)
444
444
  export interface MergeTreeRevertibleDriver {
445
445
  // (undocumented)
446
446
  annotateRange(start: number, end: number, props: PropertySet): void;
@@ -450,10 +450,10 @@ export interface MergeTreeRevertibleDriver {
450
450
  removeRange(start: number, end: number): void;
451
451
  }
452
452
 
453
- // @alpha
453
+ // @alpha @legacy
454
454
  export type PropertySet = MapLike<any>;
455
455
 
456
- // @alpha
456
+ // @alpha @legacy
457
457
  export interface ReferencePosition {
458
458
  getOffset(): number;
459
459
  getSegment(): ISegment | undefined;
@@ -465,7 +465,7 @@ export interface ReferencePosition {
465
465
  slidingPreference?: SlidingPreference;
466
466
  }
467
467
 
468
- // @alpha
468
+ // @alpha @legacy
469
469
  export enum ReferenceType {
470
470
  RangeBegin = 16,
471
471
  RangeEnd = 32,
@@ -477,32 +477,32 @@ export enum ReferenceType {
477
477
  Transient = 256
478
478
  }
479
479
 
480
- // @alpha
480
+ // @alpha @legacy
481
481
  export const refGetTileLabels: (refPos: ReferencePosition) => string[] | undefined;
482
482
 
483
- // @alpha
483
+ // @alpha @legacy
484
484
  export function refHasTileLabel(refPos: ReferencePosition, label: string): boolean;
485
485
 
486
- // @alpha
486
+ // @alpha @legacy
487
487
  export const reservedMarkerIdKey = "markerId";
488
488
 
489
- // @alpha
489
+ // @alpha @legacy
490
490
  export function revertMergeTreeDeltaRevertibles(driver: MergeTreeRevertibleDriver, revertibles: MergeTreeDeltaRevertible[]): void;
491
491
 
492
- // @alpha
492
+ // @alpha @legacy
493
493
  export function segmentIsRemoved(segment: ISegment): boolean;
494
494
 
495
- // @alpha (undocumented)
495
+ // @alpha @legacy (undocumented)
496
496
  export interface SequenceOffsets {
497
497
  // (undocumented)
498
498
  posBreakpoints: number[];
499
499
  seqs: (number | AttributionKey | null)[];
500
500
  }
501
501
 
502
- // @alpha
502
+ // @alpha @legacy
503
503
  export type SequencePlace = number | "start" | "end" | InteriorSequencePlace;
504
504
 
505
- // @alpha (undocumented)
505
+ // @alpha @legacy (undocumented)
506
506
  export interface SerializedAttributionCollection extends SequenceOffsets {
507
507
  // (undocumented)
508
508
  channels?: {
@@ -512,7 +512,7 @@ export interface SerializedAttributionCollection extends SequenceOffsets {
512
512
  length: number;
513
513
  }
514
514
 
515
- // @alpha
515
+ // @alpha @legacy
516
516
  export enum Side {
517
517
  // (undocumented)
518
518
  After = 1,
@@ -520,16 +520,16 @@ export enum Side {
520
520
  Before = 0
521
521
  }
522
522
 
523
- // @alpha
523
+ // @alpha @legacy
524
524
  export const SlidingPreference: {
525
525
  readonly BACKWARD: 0;
526
526
  readonly FORWARD: 1;
527
527
  };
528
528
 
529
- // @alpha
529
+ // @alpha @legacy
530
530
  export type SlidingPreference = (typeof SlidingPreference)[keyof typeof SlidingPreference];
531
531
 
532
- // @alpha (undocumented)
532
+ // @alpha @legacy (undocumented)
533
533
  export class TextSegment extends BaseSegment {
534
534
  constructor(text: string, props?: PropertySet);
535
535
  // (undocumented)
@@ -558,10 +558,10 @@ export class TextSegment extends BaseSegment {
558
558
  readonly type = "TextSegment";
559
559
  }
560
560
 
561
- // @alpha (undocumented)
561
+ // @alpha @legacy (undocumented)
562
562
  export type Trackable = ISegment | LocalReferencePosition;
563
563
 
564
- // @alpha (undocumented)
564
+ // @alpha @legacy (undocumented)
565
565
  export class TrackingGroup implements ITrackingGroup {
566
566
  constructor();
567
567
  // (undocumented)
@@ -576,7 +576,7 @@ export class TrackingGroup implements ITrackingGroup {
576
576
  unlink(trackable: Trackable): boolean;
577
577
  }
578
578
 
579
- // @alpha
579
+ // @alpha @legacy
580
580
  export class TrackingGroupCollection {
581
581
  constructor(trackable: Trackable);
582
582
  // (undocumented)
@@ -5,7 +5,7 @@
5
5
  "toolPackages": [
6
6
  {
7
7
  "packageName": "@microsoft/api-extractor",
8
- "packageVersion": "7.50.1"
8
+ "packageVersion": "7.52.5"
9
9
  }
10
10
  ]
11
11
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fluidframework/merge-tree",
3
- "version": "2.32.0",
3
+ "version": "2.33.0",
4
4
  "description": "Merge tree",
5
5
  "homepage": "https://fluidframework.com",
6
6
  "repository": {
@@ -81,31 +81,31 @@
81
81
  "temp-directory": "nyc/.nyc_output"
82
82
  },
83
83
  "dependencies": {
84
- "@fluid-internal/client-utils": "~2.32.0",
85
- "@fluidframework/container-definitions": "~2.32.0",
86
- "@fluidframework/core-interfaces": "~2.32.0",
87
- "@fluidframework/core-utils": "~2.32.0",
88
- "@fluidframework/datastore-definitions": "~2.32.0",
89
- "@fluidframework/driver-definitions": "~2.32.0",
90
- "@fluidframework/runtime-definitions": "~2.32.0",
91
- "@fluidframework/runtime-utils": "~2.32.0",
92
- "@fluidframework/shared-object-base": "~2.32.0",
93
- "@fluidframework/telemetry-utils": "~2.32.0"
84
+ "@fluid-internal/client-utils": "~2.33.0",
85
+ "@fluidframework/container-definitions": "~2.33.0",
86
+ "@fluidframework/core-interfaces": "~2.33.0",
87
+ "@fluidframework/core-utils": "~2.33.0",
88
+ "@fluidframework/datastore-definitions": "~2.33.0",
89
+ "@fluidframework/driver-definitions": "~2.33.0",
90
+ "@fluidframework/runtime-definitions": "~2.33.0",
91
+ "@fluidframework/runtime-utils": "~2.33.0",
92
+ "@fluidframework/shared-object-base": "~2.33.0",
93
+ "@fluidframework/telemetry-utils": "~2.33.0"
94
94
  },
95
95
  "devDependencies": {
96
96
  "@arethetypeswrong/cli": "^0.17.1",
97
97
  "@biomejs/biome": "~1.9.3",
98
- "@fluid-internal/mocha-test-setup": "~2.32.0",
99
- "@fluid-private/stochastic-test-utils": "~2.32.0",
100
- "@fluid-private/test-pairwise-generator": "~2.32.0",
98
+ "@fluid-internal/mocha-test-setup": "~2.33.0",
99
+ "@fluid-private/stochastic-test-utils": "~2.33.0",
100
+ "@fluid-private/test-pairwise-generator": "~2.33.0",
101
101
  "@fluid-tools/benchmark": "^0.50.0",
102
102
  "@fluid-tools/build-cli": "^0.55.0",
103
103
  "@fluidframework/build-common": "^2.0.3",
104
104
  "@fluidframework/build-tools": "^0.55.0",
105
105
  "@fluidframework/eslint-config-fluid": "^5.7.3",
106
- "@fluidframework/merge-tree-previous": "npm:@fluidframework/merge-tree@2.31.0",
107
- "@fluidframework/test-runtime-utils": "~2.32.0",
108
- "@microsoft/api-extractor": "7.50.1",
106
+ "@fluidframework/merge-tree-previous": "npm:@fluidframework/merge-tree@2.32.0",
107
+ "@fluidframework/test-runtime-utils": "~2.33.0",
108
+ "@microsoft/api-extractor": "7.52.5",
109
109
  "@types/diff": "^3.5.1",
110
110
  "@types/mocha": "^10.0.10",
111
111
  "@types/node": "^18.19.0",
@@ -117,8 +117,6 @@
117
117
  "eslint": "~8.55.0",
118
118
  "mocha": "^10.8.2",
119
119
  "mocha-multi-reporters": "^1.5.1",
120
- "moment": "^2.21.0",
121
- "replace-in-file": "^6.3.5",
122
120
  "rimraf": "^4.4.0",
123
121
  "typescript": "~5.4.5"
124
122
  },