Skip to content

Commit

Permalink
Merge pull request microsoft#9454 from heliocliu/MainToNext
Browse files Browse the repository at this point in the history
Note: You'll see in this PR that it's bringing over all the package versions changes from main when it got bumped to 0.58.2000. This will be resolved later because next has not been bumped to 0.59.1000 yet. In the future, any similar package version changes from main should be discarded in the merge resolution.
  • Loading branch information
heliocliu authored Mar 12, 2022
2 parents 8e2993c + 10dd607 commit 81f8efe
Show file tree
Hide file tree
Showing 275 changed files with 3,563 additions and 1,480 deletions.
6 changes: 6 additions & 0 deletions BREAKING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ There are a few steps you can take to write a good change note and avoid needing
- [Remove logger property from IContainerContext](#Remove-logger-property-from-IContainerContext)
- [Set raiseContainerWarning property as optional parameter on IContainerContext](#Set-raiseContainerWarning-property-as-optional-parameter-on-IContainerContext)
- [Consolidate fluidErrorCode and message on FF Errors](#Consolidate-fluidErrorCode-and-message-on-FF-Errors)
- [Doing operations not allowed on deleted sub directory](#Doing-operations-not-allowed-on-deleted-sub-directory)

### Move IntervalType from merge-tree to sequence package
Move the type from the merge-tree package where it isn't used to the sequence package where it is used
Expand All @@ -36,6 +37,11 @@ Previously, the fluidErrorCode value (a pascaleCased term) was often used as the
Now all error messages can be expected to be easily-read sentences,
sometimes followed by a colon and an inner error message when applicable.


### Doing operations not allowed on deleted sub directory
Users will not be allowed to do operations on a deleted directory. Users can subscribe to `disposed` event to know if a sub directory is deleted. Accessing deleted sub directory
will throw `UsageError` exception now.

## 0.57 Breaking changes
- [IFluidConfiguration removed](#IFluidConfiguration-removed)
- [Driver error constructors' signatures have changed](#driver-error-constructors-signatures-have-changed)
Expand Down
9 changes: 8 additions & 1 deletion api-report/map.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { IChannelAttributes } from '@fluidframework/datastore-definitions';
import { IChannelFactory } from '@fluidframework/datastore-definitions';
import { IChannelServices } from '@fluidframework/datastore-definitions';
import { IChannelStorageService } from '@fluidframework/datastore-definitions';
import { IDisposable } from '@fluidframework/common-definitions';
import { IEvent } from '@fluidframework/common-definitions';
import { IEventProvider } from '@fluidframework/common-definitions';
import { IEventThisPlaceHolder } from '@fluidframework/common-definitions';
Expand Down Expand Up @@ -37,7 +38,7 @@ export class DirectoryFactory {
}

// @public
export interface IDirectory extends Map<string, any>, IEventProvider<IDirectoryEvents> {
export interface IDirectory extends Map<string, any>, IEventProvider<IDirectoryEvents>, IDisposable {
readonly absolutePath: string;
createSubDirectory(subdirName: string): IDirectory;
deleteSubDirectory(subdirName: string): boolean;
Expand Down Expand Up @@ -65,6 +66,8 @@ export interface IDirectoryDataObject {
export interface IDirectoryEvents extends IEvent {
// (undocumented)
(event: "containedValueChanged", listener: (changed: IValueChanged, local: boolean, target: IEventThisPlaceHolder) => void): any;
// (undocumented)
(event: "disposed", listener: (target: IEventThisPlaceHolder) => void): any;
}

// @public (undocumented)
Expand Down Expand Up @@ -171,6 +174,10 @@ export class SharedDirectory extends SharedObject<ISharedDirectoryEvents> implem
createSubDirectory(subdirName: string): IDirectory;
delete(key: string): boolean;
deleteSubDirectory(subdirName: string): boolean;
// (undocumented)
dispose(error?: Error): void;
// (undocumented)
get disposed(): boolean;
entries(): IterableIterator<[string, any]>;
forEach(callback: (value: any, key: string, map: Map<string, any>) => void): void;
get<T = any>(key: string): T | undefined;
Expand Down
2 changes: 1 addition & 1 deletion common/lib/container-definitions/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/lib/container-definitions/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fluidframework/container-definitions",
"version": "0.47.1000",
"version": "0.47.2000",
"description": "Fluid container definitions",
"homepage": "https://fluidframework.com",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion common/lib/driver-definitions/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/lib/driver-definitions/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fluidframework/driver-definitions",
"version": "0.45.1000",
"version": "0.45.2000",
"description": "Fluid driver definitions",
"homepage": "https://fluidframework.com",
"repository": {
Expand Down
11 changes: 10 additions & 1 deletion common/lib/protocol-definitions/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions common/lib/protocol-definitions/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fluidframework/protocol-definitions",
"version": "0.1027.1000",
"version": "0.1027.2000",
"description": "Fluid protocol definitions",
"homepage": "https://fluidframework.com",
"repository": {
Expand Down Expand Up @@ -47,6 +47,7 @@
"@fluidframework/protocol-definitions-0.1024.0": "npm:@fluidframework/protocol-definitions@0.1024.0",
"@fluidframework/protocol-definitions-0.1025.1": "npm:@fluidframework/protocol-definitions@0.1025.1",
"@fluidframework/protocol-definitions-0.1026.0": "npm:@fluidframework/protocol-definitions@0.1026.0",
"@fluidframework/protocol-definitions-0.1027.0": "npm:@fluidframework/protocol-definitions@0.1027.0",
"@microsoft/api-extractor": "^7.16.1",
"@rushstack/eslint-config": "^2.5.1",
"@typescript-eslint/eslint-plugin": "~5.9.0",
Expand All @@ -65,7 +66,7 @@
"typescript-formatter": "7.1.0"
},
"typeValidation": {
"version": "0.1027.0",
"version": "0.1027.2000",
"broken": {
"0.1024.0": {
"InterfaceDeclaration_IBlob": {
Expand Down
Loading

0 comments on commit 81f8efe

Please sign in to comment.