Skip to content

Commit 3a63ec9

Browse files
Craig MacomberCraig Macomber
Craig Macomber
authored and
Craig Macomber
committed
Merge branch 'main' of https://github.com/microsoft/FluidFramework into update-webpack-dev-server
1 parent e1fec2a commit 3a63ec9

File tree

504 files changed

+11009
-11631
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

504 files changed

+11009
-11631
lines changed

BREAKING.md

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ There are a few steps you can take to write a good change note and avoid needing
2222
- [proxyLoaderFactories members to be removed from ILoaderProps and ILoaderServices](#proxyLoaderFactories-members-to-be-removed-from-ILoaderProps-and-ILoaderServices)
2323
- [routerlicious-host package and ContainerUrlResolver to be removed](#routerlicious-host-package-and-ContainerUrlResolver-to-be-removed)
2424
- [LocalReference class and method deprecations](#LocalReference-class-and-method-deprecations)
25+
- [Deprecated properties from ILoaderOptions](#Deprecated-properties-from-ILoaderOptions)
2526

2627
### Remove ICodeLoader interface
2728
ICodeLoader interface was deprecated a while ago and will be removed in the next release. Please refer to [replace ICodeLoader with ICodeDetailsLoader interface](#Replace-ICodeLoader-with-ICodeDetailsLoader-interface) for more details.
@@ -45,6 +46,9 @@ To support this change the following methods are deprecated with replacements th
4546

4647
The above methods are changes in both the @fluidframework/merge-tree and @fluidframework/sequence packages.
4748

49+
### Deprecated properties from ILoaderOptions
50+
`noopTimeFrequency` and `noopCountFrequency` from `ILoaderOptions` will be deprecated and moved to `IClientConfiguration` in `@fluidframework/protocol-definitions`.
51+
4852
## 0.59 Breaking changes
4953
- [Removing Commit from TreeEntry and commits from SnapShotTree](#Removing-Commit-from-TreeEntry-and-commits-from-SnapShotTree)
5054
- [raiseContainerWarning removed from IContainerContext](#raiseContainerWarning-removed-from-IContainerContext)

api-report/sequence.api.md

+17-11
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,17 @@ export class IntervalCollection<TInterval extends ISerializableInterval> extends
122122
// (undocumented)
123123
[Symbol.iterator](): IntervalCollectionIterator<TInterval>;
124124
constructor(helpers: IIntervalHelpers<TInterval>, requiresClient: boolean, emitter: IValueOpEmitter, serializedIntervals: ISerializedInterval[]);
125+
// @internal (undocumented)
126+
ackAdd(serializedInterval: ISerializedInterval, local: boolean, op: ISequencedDocumentMessage): TInterval;
127+
// @internal (undocumented)
128+
ackChange(serializedInterval: ISerializedInterval, local: boolean, op: ISequencedDocumentMessage): void;
129+
// @internal (undocumented)
130+
ackDelete(serializedInterval: ISerializedInterval, local: boolean, op: ISequencedDocumentMessage): void;
125131
// (undocumented)
126132
add(start: number, end: number, intervalType: IntervalType, props?: PropertySet): TInterval;
127133
// (undocumented)
128134
addConflictResolver(conflictResolver: IntervalConflictResolver<TInterval>): void;
129-
// (undocumented)
135+
// @deprecated (undocumented)
130136
addInternal(serializedInterval: ISerializedInterval, local: boolean, op: ISequencedDocumentMessage): TInterval;
131137
// (undocumented)
132138
attachDeserializer(onDeserialize: DeserializeCallback): void;
@@ -136,7 +142,7 @@ export class IntervalCollection<TInterval extends ISerializableInterval> extends
136142
attachGraph(client: Client, label: string): void;
137143
// (undocumented)
138144
change(id: string, start?: number, end?: number): TInterval | undefined;
139-
// (undocumented)
145+
// @deprecated (undocumented)
140146
changeInterval(serializedInterval: ISerializedInterval, local: boolean, op: ISequencedDocumentMessage): void;
141147
// (undocumented)
142148
changeProperties(id: string, props: PropertySet): void;
@@ -148,7 +154,7 @@ export class IntervalCollection<TInterval extends ISerializableInterval> extends
148154
CreateForwardIteratorWithEndPosition(endPosition: number): IntervalCollectionIterator<TInterval>;
149155
// (undocumented)
150156
CreateForwardIteratorWithStartPosition(startPosition: number): IntervalCollectionIterator<TInterval>;
151-
// (undocumented)
157+
// @deprecated (undocumented)
152158
deleteInterval(serializedInterval: ISerializedInterval, local: boolean, op: ISequencedDocumentMessage): void;
153159
// (undocumented)
154160
findOverlappingIntervals(startPosition: number, endPosition: number): TInterval[];
@@ -410,17 +416,17 @@ export class SequenceMaintenanceEvent extends SequenceEvent<MergeTreeMaintenance
410416
readonly opArgs: IMergeTreeDeltaOpArgs | undefined;
411417
}
412418

413-
// @public (undocumented)
414-
export class SharedIntervalCollection<TInterval extends ISerializableInterval = Interval> extends SharedObject implements ISharedIntervalCollection<TInterval> {
419+
// @public @deprecated (undocumented)
420+
export class SharedIntervalCollection extends SharedObject implements ISharedIntervalCollection<Interval> {
415421
// (undocumented)
416422
readonly [Symbol.toStringTag]: string;
417423
constructor(id: string, runtime: IFluidDataStoreRuntime, attributes: IChannelAttributes);
418424
// (undocumented)
419425
protected applyStashedOp(): void;
420-
static create(runtime: IFluidDataStoreRuntime, id?: string): SharedIntervalCollection<Interval>;
426+
static create(runtime: IFluidDataStoreRuntime, id?: string): SharedIntervalCollection;
421427
static getFactory(): IChannelFactory;
422428
// (undocumented)
423-
getIntervalCollection(label: string): IntervalCollection<TInterval>;
429+
getIntervalCollection(label: string): IntervalCollection<Interval>;
424430
protected getIntervalCollectionPath(label: string): string;
425431
// (undocumented)
426432
protected loadCore(storage: IChannelStorageService): Promise<void>;
@@ -432,11 +438,11 @@ export class SharedIntervalCollection<TInterval extends ISerializableInterval =
432438
protected reSubmitCore(content: any, localOpMetadata: unknown): void;
433439
// (undocumented)
434440
protected summarizeCore(serializer: IFluidSerializer): ISummaryTreeWithStats;
435-
// (undocumented)
436-
waitIntervalCollection(label: string): Promise<IntervalCollection<TInterval>>;
441+
// @deprecated (undocumented)
442+
waitIntervalCollection(label: string): Promise<IntervalCollection<Interval>>;
437443
}
438444

439-
// @public
445+
// @public @deprecated
440446
export class SharedIntervalCollectionFactory implements IChannelFactory {
441447
// (undocumented)
442448
static readonly Attributes: IChannelAttributes;
@@ -596,7 +602,7 @@ export abstract class SharedSegmentSequence<T extends ISegment> extends SharedOb
596602
submitSequenceMessage(message: IMergeTreeOp): void;
597603
// (undocumented)
598604
protected summarizeCore(serializer: IFluidSerializer): ISummaryTreeWithStats;
599-
// (undocumented)
605+
// @deprecated (undocumented)
600606
waitIntervalCollection(label: string): Promise<IntervalCollection<SequenceInterval>>;
601607
walkSegments<TClientData>(handler: ISegmentAction<TClientData>, start?: number, end?: number, accum?: TClientData, splitRange?: boolean): void;
602608
}

0 commit comments

Comments
 (0)