From 8e256ba24d390bfaa5398a874a059c69363db7d3 Mon Sep 17 00:00:00 2001 From: MarioJGMsoft Date: Thu, 17 Oct 2024 22:22:59 +0000 Subject: [PATCH 01/10] Removing ensureNoDataModelChanges --- .../container-runtime/src/channelCollection.ts | 4 ---- .../container-runtime/src/dataStoreContext.ts | 6 ------ .../runtime-definitions/src/dataStoreContext.ts | 13 ------------- .../test-runtime-utils/src/mocksDataStoreContext.ts | 5 ----- 4 files changed, 28 deletions(-) diff --git a/packages/runtime/container-runtime/src/channelCollection.ts b/packages/runtime/container-runtime/src/channelCollection.ts index 6ee5057da7f0..4a6a79db8331 100644 --- a/packages/runtime/container-runtime/src/channelCollection.ts +++ b/packages/runtime/container-runtime/src/channelCollection.ts @@ -178,10 +178,6 @@ export function wrapContext(context: IFluidParentContext): IFluidParentContext { getAudience: (...args) => { return context.getAudience(...args); }, - // back-compat, to be removed in 2.0 - ensureNoDataModelChanges: (...args) => { - return context.ensureNoDataModelChanges(...args); - }, submitMessage: (...args) => { return context.submitMessage(...args); }, diff --git a/packages/runtime/container-runtime/src/dataStoreContext.ts b/packages/runtime/container-runtime/src/dataStoreContext.ts index 99d37040ab9a..932fb4af6e42 100644 --- a/packages/runtime/container-runtime/src/dataStoreContext.ts +++ b/packages/runtime/container-runtime/src/dataStoreContext.ts @@ -222,12 +222,6 @@ export abstract class FluidDataStoreContext public get containerRuntime(): IContainerRuntimeBase { return this._containerRuntime; } - - // back-compat, to be removed in 2.0 - public ensureNoDataModelChanges(callback: () => T): T { - return this.parentContext.ensureNoDataModelChanges(callback); - } - public get isLoaded(): boolean { return this.loaded; } diff --git a/packages/runtime/runtime-definitions/src/dataStoreContext.ts b/packages/runtime/runtime-definitions/src/dataStoreContext.ts index 3e9f62f78600..0c22c63ecbb7 100644 --- a/packages/runtime/runtime-definitions/src/dataStoreContext.ts +++ b/packages/runtime/runtime-definitions/src/dataStoreContext.ts @@ -477,19 +477,6 @@ export interface IFluidParentContext */ getAudience(): IAudience; - /** - * Invokes the given callback and expects that no ops are submitted - * until execution finishes. If an op is submitted, an error will be raised. - * - * Can be disabled by feature gate `Fluid.ContainerRuntime.DisableOpReentryCheck` - * - * @param callback - the callback to be invoked - * - * @deprecated - * // back-compat: to be removed in 2.0 - */ - ensureNoDataModelChanges(callback: () => T): T; - /** * Submits the message to be sent to other clients. * @param type - Type of the message. diff --git a/packages/runtime/test-runtime-utils/src/mocksDataStoreContext.ts b/packages/runtime/test-runtime-utils/src/mocksDataStoreContext.ts index 906291816349..c8b14adacadc 100644 --- a/packages/runtime/test-runtime-utils/src/mocksDataStoreContext.ts +++ b/packages/runtime/test-runtime-utils/src/mocksDataStoreContext.ts @@ -96,11 +96,6 @@ export class MockFluidDataStoreContext implements IFluidDataStoreContext { throw new Error("Method not implemented."); } - // back-compat: to be removed in 2.0 - public ensureNoDataModelChanges(callback: () => T): T { - return callback(); - } - public getQuorum(): IQuorumClients { return undefined as any as IQuorumClients; } From d03675383d9180cfe0ceddee056eac93a46d7752 Mon Sep 17 00:00:00 2001 From: MarioJGMsoft Date: Thu, 17 Oct 2024 22:37:10 +0000 Subject: [PATCH 02/10] Fixed back-compat breaks --- packages/framework/aqueduct/package.json | 6 +++++- .../test/types/validateAqueductPrevious.generated.ts | 1 + packages/runtime/runtime-definitions/package.json | 12 +++++++++++- .../validateRuntimeDefinitionsPrevious.generated.ts | 3 +++ packages/runtime/test-runtime-utils/package.json | 9 ++++++++- .../validateTestRuntimeUtilsPrevious.generated.ts | 2 ++ packages/test/test-utils/package.json | 9 ++++++++- .../types/validateTestUtilsPrevious.generated.ts | 2 ++ 8 files changed, 40 insertions(+), 4 deletions(-) diff --git a/packages/framework/aqueduct/package.json b/packages/framework/aqueduct/package.json index 2e377063823d..bdf39a4fb140 100644 --- a/packages/framework/aqueduct/package.json +++ b/packages/framework/aqueduct/package.json @@ -156,7 +156,11 @@ "typescript": "~5.4.5" }, "typeValidation": { - "broken": {}, + "broken": { + "Interface_IDataObjectProps": { + "backCompat": false + } + }, "entrypoint": "legacy" } } diff --git a/packages/framework/aqueduct/src/test/types/validateAqueductPrevious.generated.ts b/packages/framework/aqueduct/src/test/types/validateAqueductPrevious.generated.ts index ca578b870142..8684174e0234 100644 --- a/packages/framework/aqueduct/src/test/types/validateAqueductPrevious.generated.ts +++ b/packages/framework/aqueduct/src/test/types/validateAqueductPrevious.generated.ts @@ -247,4 +247,5 @@ declare type old_as_current_for_Interface_IDataObjectProps = requireAssignableTo * typeValidation.broken: * "Interface_IDataObjectProps": {"backCompat": false} */ +// @ts-expect-error compatibility expected to be broken declare type current_as_old_for_Interface_IDataObjectProps = requireAssignableTo, TypeOnly> diff --git a/packages/runtime/runtime-definitions/package.json b/packages/runtime/runtime-definitions/package.json index 6dc302ea29b1..a218fcf5c1bf 100644 --- a/packages/runtime/runtime-definitions/package.json +++ b/packages/runtime/runtime-definitions/package.json @@ -111,7 +111,17 @@ "typescript": "~5.4.5" }, "typeValidation": { - "broken": {}, + "broken": { + "Interface_IFluidDataStoreContext": { + "backCompat": false + }, + "Interface_IFluidDataStoreContextDetached": { + "backCompat": false + }, + "Interface_IFluidParentContext": { + "backCompat": false + } + }, "entrypoint": "legacy" } } diff --git a/packages/runtime/runtime-definitions/src/test/types/validateRuntimeDefinitionsPrevious.generated.ts b/packages/runtime/runtime-definitions/src/test/types/validateRuntimeDefinitionsPrevious.generated.ts index 5df443622887..48f27001fa93 100644 --- a/packages/runtime/runtime-definitions/src/test/types/validateRuntimeDefinitionsPrevious.generated.ts +++ b/packages/runtime/runtime-definitions/src/test/types/validateRuntimeDefinitionsPrevious.generated.ts @@ -211,6 +211,7 @@ declare type old_as_current_for_Interface_IFluidDataStoreContext = requireAssign * typeValidation.broken: * "Interface_IFluidDataStoreContext": {"backCompat": false} */ +// @ts-expect-error compatibility expected to be broken declare type current_as_old_for_Interface_IFluidDataStoreContext = requireAssignableTo, TypeOnly> /* @@ -229,6 +230,7 @@ declare type old_as_current_for_Interface_IFluidDataStoreContextDetached = requi * typeValidation.broken: * "Interface_IFluidDataStoreContextDetached": {"backCompat": false} */ +// @ts-expect-error compatibility expected to be broken declare type current_as_old_for_Interface_IFluidDataStoreContextDetached = requireAssignableTo, TypeOnly> /* @@ -283,6 +285,7 @@ declare type old_as_current_for_Interface_IFluidParentContext = requireAssignabl * typeValidation.broken: * "Interface_IFluidParentContext": {"backCompat": false} */ +// @ts-expect-error compatibility expected to be broken declare type current_as_old_for_Interface_IFluidParentContext = requireAssignableTo, TypeOnly> /* diff --git a/packages/runtime/test-runtime-utils/package.json b/packages/runtime/test-runtime-utils/package.json index 990e065c9355..a939388bda66 100644 --- a/packages/runtime/test-runtime-utils/package.json +++ b/packages/runtime/test-runtime-utils/package.json @@ -157,7 +157,14 @@ "typescript": "~5.4.5" }, "typeValidation": { - "broken": {}, + "broken": { + "Class_MockFluidDataStoreContext": { + "backCompat": false + }, + "ClassStatics_MockFluidDataStoreContext": { + "backCompat": false + } + }, "entrypoint": "legacy" } } diff --git a/packages/runtime/test-runtime-utils/src/test/types/validateTestRuntimeUtilsPrevious.generated.ts b/packages/runtime/test-runtime-utils/src/test/types/validateTestRuntimeUtilsPrevious.generated.ts index bb782e3a2aa2..d6f765fb97e6 100644 --- a/packages/runtime/test-runtime-utils/src/test/types/validateTestRuntimeUtilsPrevious.generated.ts +++ b/packages/runtime/test-runtime-utils/src/test/types/validateTestRuntimeUtilsPrevious.generated.ts @@ -175,6 +175,7 @@ declare type old_as_current_for_Class_MockFluidDataStoreContext = requireAssigna * typeValidation.broken: * "Class_MockFluidDataStoreContext": {"backCompat": false} */ +// @ts-expect-error compatibility expected to be broken declare type current_as_old_for_Class_MockFluidDataStoreContext = requireAssignableTo, TypeOnly> /* @@ -364,6 +365,7 @@ declare type current_as_old_for_ClassStatics_MockDeltaQueue = requireAssignableT * typeValidation.broken: * "ClassStatics_MockFluidDataStoreContext": {"backCompat": false} */ +// @ts-expect-error compatibility expected to be broken declare type current_as_old_for_ClassStatics_MockFluidDataStoreContext = requireAssignableTo, TypeOnly> /* diff --git a/packages/test/test-utils/package.json b/packages/test/test-utils/package.json index 62af2060ef15..d8e0bc74afb1 100644 --- a/packages/test/test-utils/package.json +++ b/packages/test/test-utils/package.json @@ -167,7 +167,14 @@ "typescript": "~5.4.5" }, "typeValidation": { - "broken": {}, + "broken": { + "Interface_IProvideTestFluidObject": { + "backCompat": false + }, + "Interface_ITestFluidObject": { + "backCompat": false + } + }, "entrypoint": "legacy" } } diff --git a/packages/test/test-utils/src/test/types/validateTestUtilsPrevious.generated.ts b/packages/test/test-utils/src/test/types/validateTestUtilsPrevious.generated.ts index 23bb8b2365d0..d14180f98964 100644 --- a/packages/test/test-utils/src/test/types/validateTestUtilsPrevious.generated.ts +++ b/packages/test/test-utils/src/test/types/validateTestUtilsPrevious.generated.ts @@ -85,6 +85,7 @@ declare type old_as_current_for_Interface_IProvideTestFluidObject = requireAssig * typeValidation.broken: * "Interface_IProvideTestFluidObject": {"backCompat": false} */ +// @ts-expect-error compatibility expected to be broken declare type current_as_old_for_Interface_IProvideTestFluidObject = requireAssignableTo, TypeOnly> /* @@ -103,4 +104,5 @@ declare type old_as_current_for_Interface_ITestFluidObject = requireAssignableTo * typeValidation.broken: * "Interface_ITestFluidObject": {"backCompat": false} */ +// @ts-expect-error compatibility expected to be broken declare type current_as_old_for_Interface_ITestFluidObject = requireAssignableTo, TypeOnly> From c3698dfef87ad3a74e9d3ea307e8a0ac635c292d Mon Sep 17 00:00:00 2001 From: MarioJGMsoft Date: Thu, 17 Oct 2024 22:52:05 +0000 Subject: [PATCH 03/10] updated api runtime --- .../api-report/runtime-definitions.legacy.alpha.api.md | 2 -- .../api-report/test-runtime-utils.legacy.alpha.api.md | 2 -- 2 files changed, 4 deletions(-) diff --git a/packages/runtime/runtime-definitions/api-report/runtime-definitions.legacy.alpha.api.md b/packages/runtime/runtime-definitions/api-report/runtime-definitions.legacy.alpha.api.md index 514b1ce8e84d..b5b7b89cc7c6 100644 --- a/packages/runtime/runtime-definitions/api-report/runtime-definitions.legacy.alpha.api.md +++ b/packages/runtime/runtime-definitions/api-report/runtime-definitions.legacy.alpha.api.md @@ -206,8 +206,6 @@ export interface IFluidParentContext extends IProvideFluidHandleContext, Partial deleteChildSummarizerNode(id: string): void; // (undocumented) readonly deltaManager: IDeltaManager; - // @deprecated - ensureNoDataModelChanges(callback: () => T): T; // @deprecated (undocumented) readonly gcThrowOnTombstoneUsage: boolean; // @deprecated (undocumented) diff --git a/packages/runtime/test-runtime-utils/api-report/test-runtime-utils.legacy.alpha.api.md b/packages/runtime/test-runtime-utils/api-report/test-runtime-utils.legacy.alpha.api.md index e8af0df00209..266620408009 100644 --- a/packages/runtime/test-runtime-utils/api-report/test-runtime-utils.legacy.alpha.api.md +++ b/packages/runtime/test-runtime-utils/api-report/test-runtime-utils.legacy.alpha.api.md @@ -301,8 +301,6 @@ export class MockFluidDataStoreContext implements IFluidDataStoreContext { // (undocumented) deltaManager: IDeltaManager; // (undocumented) - ensureNoDataModelChanges(callback: () => T): T; - // (undocumented) readonly existing: boolean; // (undocumented) readonly gcThrowOnTombstoneUsage = false; From 4de92ce674a2d84642088c2779c65f563065d45a Mon Sep 17 00:00:00 2001 From: MarioJGMsoft Date: Mon, 11 Nov 2024 23:48:22 +0000 Subject: [PATCH 04/10] marked as deprecated based on comments --- .../api-report/test-runtime-utils.legacy.alpha.api.md | 2 ++ packages/runtime/test-runtime-utils/package.json | 9 +-------- .../test-runtime-utils/src/mocksDataStoreContext.ts | 7 +++++++ .../types/validateTestRuntimeUtilsPrevious.generated.ts | 2 -- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/runtime/test-runtime-utils/api-report/test-runtime-utils.legacy.alpha.api.md b/packages/runtime/test-runtime-utils/api-report/test-runtime-utils.legacy.alpha.api.md index 266620408009..f6aca2a6589f 100644 --- a/packages/runtime/test-runtime-utils/api-report/test-runtime-utils.legacy.alpha.api.md +++ b/packages/runtime/test-runtime-utils/api-report/test-runtime-utils.legacy.alpha.api.md @@ -300,6 +300,8 @@ export class MockFluidDataStoreContext implements IFluidDataStoreContext { deleteChildSummarizerNode(id: string): void; // (undocumented) deltaManager: IDeltaManager; + // @deprecated (undocumented) + ensureNoDataModelChanges(callback: () => T): T; // (undocumented) readonly existing: boolean; // (undocumented) diff --git a/packages/runtime/test-runtime-utils/package.json b/packages/runtime/test-runtime-utils/package.json index a939388bda66..990e065c9355 100644 --- a/packages/runtime/test-runtime-utils/package.json +++ b/packages/runtime/test-runtime-utils/package.json @@ -157,14 +157,7 @@ "typescript": "~5.4.5" }, "typeValidation": { - "broken": { - "Class_MockFluidDataStoreContext": { - "backCompat": false - }, - "ClassStatics_MockFluidDataStoreContext": { - "backCompat": false - } - }, + "broken": {}, "entrypoint": "legacy" } } diff --git a/packages/runtime/test-runtime-utils/src/mocksDataStoreContext.ts b/packages/runtime/test-runtime-utils/src/mocksDataStoreContext.ts index c8b14adacadc..6ce102afa3b0 100644 --- a/packages/runtime/test-runtime-utils/src/mocksDataStoreContext.ts +++ b/packages/runtime/test-runtime-utils/src/mocksDataStoreContext.ts @@ -96,6 +96,13 @@ export class MockFluidDataStoreContext implements IFluidDataStoreContext { throw new Error("Method not implemented."); } + /** + * @deprecated back-compat: to be removed in 2.0 + */ + public ensureNoDataModelChanges(callback: () => T): T { + return callback(); + } + public getQuorum(): IQuorumClients { return undefined as any as IQuorumClients; } diff --git a/packages/runtime/test-runtime-utils/src/test/types/validateTestRuntimeUtilsPrevious.generated.ts b/packages/runtime/test-runtime-utils/src/test/types/validateTestRuntimeUtilsPrevious.generated.ts index d6f765fb97e6..bb782e3a2aa2 100644 --- a/packages/runtime/test-runtime-utils/src/test/types/validateTestRuntimeUtilsPrevious.generated.ts +++ b/packages/runtime/test-runtime-utils/src/test/types/validateTestRuntimeUtilsPrevious.generated.ts @@ -175,7 +175,6 @@ declare type old_as_current_for_Class_MockFluidDataStoreContext = requireAssigna * typeValidation.broken: * "Class_MockFluidDataStoreContext": {"backCompat": false} */ -// @ts-expect-error compatibility expected to be broken declare type current_as_old_for_Class_MockFluidDataStoreContext = requireAssignableTo, TypeOnly> /* @@ -365,7 +364,6 @@ declare type current_as_old_for_ClassStatics_MockDeltaQueue = requireAssignableT * typeValidation.broken: * "ClassStatics_MockFluidDataStoreContext": {"backCompat": false} */ -// @ts-expect-error compatibility expected to be broken declare type current_as_old_for_ClassStatics_MockFluidDataStoreContext = requireAssignableTo, TypeOnly> /* From 817aefafa9ea217ec1e2c7387020ad4e77feda06 Mon Sep 17 00:00:00 2001 From: MarioJGMsoft Date: Tue, 12 Nov 2024 00:10:33 +0000 Subject: [PATCH 05/10] fixed merge --- packages/test/test-utils/package.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/test/test-utils/package.json b/packages/test/test-utils/package.json index d8e0bc74afb1..228bf0186a09 100644 --- a/packages/test/test-utils/package.json +++ b/packages/test/test-utils/package.json @@ -168,6 +168,12 @@ }, "typeValidation": { "broken": { + "Class_TestFluidObject": { + "backCompat": false + }, + "ClassStatics_TestFluidObject": { + "backCompat": false + }, "Interface_IProvideTestFluidObject": { "backCompat": false }, From 310f952d72bcff6d7415beaa3d9539286fd9c1ed Mon Sep 17 00:00:00 2001 From: MarioJGMsoft Date: Tue, 12 Nov 2024 18:11:44 +0000 Subject: [PATCH 06/10] Added changeset and updated code comments --- .changeset/icy-webs-help.md | 14 ++++++++++++++ .../src/mocksDataStoreContext.ts | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 .changeset/icy-webs-help.md diff --git a/.changeset/icy-webs-help.md b/.changeset/icy-webs-help.md new file mode 100644 index 000000000000..32236d1929b3 --- /dev/null +++ b/.changeset/icy-webs-help.md @@ -0,0 +1,14 @@ +--- +"@fluidframework/container-runtime": minor +"@fluidframework/runtime-definitions": minor +"@fluidframework/test-runtime-utils": minor +--- +--- +"section": deprecation +--- + +Removed and marked as deprecated uses of ensureNoDataModelChanges. + +The function ensureNoDataModelChanges in FluidDataStoreContext and IFluidParentContext that are found in the file dataStoreContext.ts in runtime-definitions and container-runtime had been marked as [deprecated and to be removed in 2.0](https://github.com/microsoft/FluidFramework/commit/c9d156264bdfa211a3075bdf29cde442ecea234c). + +The instance of ensureNoDataModelChanges in MockFluidDataStoreContext has been marked as deprecated and it is set to be removed in release 2.20. diff --git a/packages/runtime/test-runtime-utils/src/mocksDataStoreContext.ts b/packages/runtime/test-runtime-utils/src/mocksDataStoreContext.ts index 6ce102afa3b0..fb5e927cf3fc 100644 --- a/packages/runtime/test-runtime-utils/src/mocksDataStoreContext.ts +++ b/packages/runtime/test-runtime-utils/src/mocksDataStoreContext.ts @@ -97,7 +97,8 @@ export class MockFluidDataStoreContext implements IFluidDataStoreContext { } /** - * @deprecated back-compat: to be removed in 2.0 + * @deprecated + * // back-compat: to be removed in 2.20 */ public ensureNoDataModelChanges(callback: () => T): T { return callback(); From 352b303d97b2fa5a26cbdf9cac3603060f1563aa Mon Sep 17 00:00:00 2001 From: MarioJGMsoft Date: Wed, 13 Nov 2024 18:15:24 +0000 Subject: [PATCH 07/10] Applied changes based on comments --- .changeset/icy-webs-help.md | 6 +++--- .../runtime/test-runtime-utils/src/mocksDataStoreContext.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.changeset/icy-webs-help.md b/.changeset/icy-webs-help.md index 32236d1929b3..f30ef0c4b7b5 100644 --- a/.changeset/icy-webs-help.md +++ b/.changeset/icy-webs-help.md @@ -4,11 +4,11 @@ "@fluidframework/test-runtime-utils": minor --- --- -"section": deprecation +"section": legacy --- Removed and marked as deprecated uses of ensureNoDataModelChanges. -The function ensureNoDataModelChanges in FluidDataStoreContext and IFluidParentContext that are found in the file dataStoreContext.ts in runtime-definitions and container-runtime had been marked as [deprecated and to be removed in 2.0](https://github.com/microsoft/FluidFramework/commit/c9d156264bdfa211a3075bdf29cde442ecea234c). +- `IFluidParentContext.ensureNoDataModelChanges` has been moved. [prior deprecation commit](https://github.com/microsoft/FluidFramework/commit/c9d156264bdfa211a3075bdf29cde442ecea234c). -The instance of ensureNoDataModelChanges in MockFluidDataStoreContext has been marked as deprecated and it is set to be removed in release 2.20. +- `MockFluidDataStoreContext.ensureNoDataModelChanges` no longer has use and is deprecated to be removed in release 2.20. diff --git a/packages/runtime/test-runtime-utils/src/mocksDataStoreContext.ts b/packages/runtime/test-runtime-utils/src/mocksDataStoreContext.ts index fb5e927cf3fc..7495980cbe3e 100644 --- a/packages/runtime/test-runtime-utils/src/mocksDataStoreContext.ts +++ b/packages/runtime/test-runtime-utils/src/mocksDataStoreContext.ts @@ -98,7 +98,7 @@ export class MockFluidDataStoreContext implements IFluidDataStoreContext { /** * @deprecated - * // back-compat: to be removed in 2.20 + * back-compat: to be removed in 2.20 */ public ensureNoDataModelChanges(callback: () => T): T { return callback(); From bffeadd8d5717821f7b9d71eb07f794635142bf4 Mon Sep 17 00:00:00 2001 From: MarioJGMsoft Date: Wed, 13 Nov 2024 19:35:24 +0000 Subject: [PATCH 08/10] Applied changes based on comments --- .changeset/icy-webs-help.md | 4 +--- .../api-report/test-runtime-utils.legacy.alpha.api.md | 2 -- .../test-runtime-utils/src/mocksDataStoreContext.ts | 8 -------- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/.changeset/icy-webs-help.md b/.changeset/icy-webs-help.md index f30ef0c4b7b5..459477049687 100644 --- a/.changeset/icy-webs-help.md +++ b/.changeset/icy-webs-help.md @@ -7,8 +7,6 @@ "section": legacy --- -Removed and marked as deprecated uses of ensureNoDataModelChanges. +Removed uses of ensureNoDataModelChanges. - `IFluidParentContext.ensureNoDataModelChanges` has been moved. [prior deprecation commit](https://github.com/microsoft/FluidFramework/commit/c9d156264bdfa211a3075bdf29cde442ecea234c). - -- `MockFluidDataStoreContext.ensureNoDataModelChanges` no longer has use and is deprecated to be removed in release 2.20. diff --git a/packages/runtime/test-runtime-utils/api-report/test-runtime-utils.legacy.alpha.api.md b/packages/runtime/test-runtime-utils/api-report/test-runtime-utils.legacy.alpha.api.md index bf7e0a58fe5a..9608746b9726 100644 --- a/packages/runtime/test-runtime-utils/api-report/test-runtime-utils.legacy.alpha.api.md +++ b/packages/runtime/test-runtime-utils/api-report/test-runtime-utils.legacy.alpha.api.md @@ -302,8 +302,6 @@ export class MockFluidDataStoreContext implements IFluidDataStoreContext { deleteChildSummarizerNode(id: string): void; // (undocumented) deltaManager: IDeltaManager; - // @deprecated (undocumented) - ensureNoDataModelChanges(callback: () => T): T; // (undocumented) readonly existing: boolean; // (undocumented) diff --git a/packages/runtime/test-runtime-utils/src/mocksDataStoreContext.ts b/packages/runtime/test-runtime-utils/src/mocksDataStoreContext.ts index 7495980cbe3e..c8b14adacadc 100644 --- a/packages/runtime/test-runtime-utils/src/mocksDataStoreContext.ts +++ b/packages/runtime/test-runtime-utils/src/mocksDataStoreContext.ts @@ -96,14 +96,6 @@ export class MockFluidDataStoreContext implements IFluidDataStoreContext { throw new Error("Method not implemented."); } - /** - * @deprecated - * back-compat: to be removed in 2.20 - */ - public ensureNoDataModelChanges(callback: () => T): T { - return callback(); - } - public getQuorum(): IQuorumClients { return undefined as any as IQuorumClients; } From 1598800c984d2d786e7c148b92b9496b27786c45 Mon Sep 17 00:00:00 2001 From: MarioJGMsoft Date: Wed, 13 Nov 2024 22:37:29 +0000 Subject: [PATCH 09/10] Applied changes based on comments --- .changeset/icy-webs-help.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.changeset/icy-webs-help.md b/.changeset/icy-webs-help.md index 459477049687..6e26865ba23f 100644 --- a/.changeset/icy-webs-help.md +++ b/.changeset/icy-webs-help.md @@ -7,6 +7,6 @@ "section": legacy --- -Removed uses of ensureNoDataModelChanges. +"Remove IFluidParentContext.ensureNoDataModelChanges and its implementations -- `IFluidParentContext.ensureNoDataModelChanges` has been moved. [prior deprecation commit](https://github.com/microsoft/FluidFramework/commit/c9d156264bdfa211a3075bdf29cde442ecea234c). +- `IFluidParentContext.ensureNoDataModelChanges` has been removed. [prior deprecation commit](https://github.com/microsoft/FluidFramework/commit/c9d156264bdfa211a3075bdf29cde442ecea234c) From 5a45ae4a6641654e2f0e78643f31ab3abc01fb0d Mon Sep 17 00:00:00 2001 From: MarioJGMsoft Date: Wed, 13 Nov 2024 22:43:57 +0000 Subject: [PATCH 10/10] Applied changes based on comments --- .changeset/icy-webs-help.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.changeset/icy-webs-help.md b/.changeset/icy-webs-help.md index 6e26865ba23f..395bc6c8e385 100644 --- a/.changeset/icy-webs-help.md +++ b/.changeset/icy-webs-help.md @@ -7,6 +7,8 @@ "section": legacy --- -"Remove IFluidParentContext.ensureNoDataModelChanges and its implementations +"Remove `IFluidParentContext.ensureNoDataModelChanges` and its implementations - `IFluidParentContext.ensureNoDataModelChanges` has been removed. [prior deprecation commit](https://github.com/microsoft/FluidFramework/commit/c9d156264bdfa211a3075bdf29cde442ecea234c) + +- `MockFluidDataStoreContext.ensureNoDataModelChanges` has also been removed.