From a8c81509c9bf09cfb2092ebcf7265205f9eb6dbf Mon Sep 17 00:00:00 2001 From: Tyler Butler Date: Thu, 17 Aug 2023 16:50:57 -0700 Subject: [PATCH] refactor: Copy APIs out of common-definitions and remove dependencies (#16638) This PR deprecates the following types and interfaces from the common-definitions package: - interface IErrorEvent - interface IErrorEvent - interface IEvent - interface IEventProvider - type ExtendEventProvider - type IEventThisPlaceHolder - type IEventTransformer - type ReplaceIEventThisPlaceHolder The code has been copied into the core-interfaces package for client use. - All client package uses have been updated to use the core-interfaces implementation instead of common-definitions. - There are no longer any client dependencies on common-definitions. - **However,** there are still _server_ dependencies on common-definitions. It's not clear where the event-related APIs should live for server, so server continues to use the now-deprecated versions from common-definitions. - Also, protocol-definitions still imports and uses IErrorEvent and IEventProvider from common-definitions. I left those uses in place rather than copying the APIs into protocol-definitions. --- .changeset/ready-games-sniff.md | 68 +++ api-report/aqueduct.api.md | 4 +- api-report/attributable-map.api.md | 2 +- api-report/container-definitions.api.md | 6 +- .../container-runtime-definitions.api.md | 2 +- api-report/container-runtime.api.md | 4 +- api-report/container-utils.api.md | 2 +- api-report/core-interfaces.api.md | 188 ++++++++ api-report/data-object-base.api.md | 2 +- api-report/datastore-definitions.api.md | 4 +- api-report/driver-definitions.api.md | 4 +- api-report/experimental-tree.api.md | 2 +- api-report/fluid-static.api.md | 4 +- api-report/map.api.md | 6 +- api-report/merge-tree.api.md | 2 +- api-report/oldest-client-observer.api.md | 4 +- api-report/runtime-definitions.api.md | 4 +- api-report/sequence.api.md | 4 +- api-report/shared-object-base.api.md | 6 +- api-report/telemetry-utils.api.md | 2 +- .../packages/external-controller/package.json | 1 - .../test/scenario-runner/package.json | 1 - .../test/scenario-runner/src/interface.ts | 3 +- .../test/scenario-runner/src/logger.ts | 3 +- common/lib/common-definitions/CHANGELOG.md | 16 +- .../api-report/common-definitions.api.md | 16 +- common/lib/common-definitions/src/events.ts | 15 + docs/content/docs/testing/telemetry.md | 2 +- examples/apps/attributable-map/package.json | 1 - .../apps/collaborative-textarea/package.json | 1 - examples/apps/contact-collection/package.json | 1 - examples/apps/data-object-grid/package.json | 1 - examples/apps/presence-tracker/package.json | 2 +- .../apps/presence-tracker/src/FocusTracker.ts | 2 +- .../apps/presence-tracker/src/MouseTracker.ts | 2 +- examples/apps/task-selection/package.json | 1 - .../bubblebench/baseline/package.json | 1 - .../editable-shared-tree/package.json | 1 - .../benchmarks/bubblebench/ot/package.json | 1 - .../bubblebench/sharedtree/package.json | 1 - examples/data-objects/canvas/package.json | 1 - examples/data-objects/clicker/package.json | 1 - examples/data-objects/clicker/src/index.tsx | 3 +- examples/data-objects/diceroller/package.json | 1 - .../constellation-model/package.json | 1 - .../multiview/coordinate-model/package.json | 1 - .../data-objects/table-document/package.json | 1 - .../table-document/src/document.ts | 3 +- examples/data-objects/table-view/package.json | 1 - examples/data-objects/webflow/package.json | 1 - .../webflow/src/document/index.ts | 3 +- examples/external-data/package.json | 1 - .../externalDataSource.ts | 2 +- .../src/model-interface/index.ts | 2 +- examples/utils/example-utils/package.json | 1 - .../migrationInterfaces/migratableModel.ts | 2 +- .../src/migrationInterfaces/migrationTool.ts | 2 +- .../src/migrationInterfaces/migrator.ts | 2 +- .../sameContainerMigratableModel.ts | 2 +- .../sameContainerMigrationTool.ts | 2 +- .../sameContainerMigrator.ts | 2 +- .../live-schema-upgrade/package.json | 1 - .../same-container/package.json | 1 - .../same-container/src/modelInterfaces.ts | 2 +- .../schema-upgrade/package.json | 1 - .../schema-upgrade/src/modelInterfaces.ts | 2 +- .../container-views/package.json | 1 - .../external-views/package.json | 1 - .../view-framework-sampler/package.json | 1 - .../dds/attributable-map/package.json | 1 - .../dds/attributable-map/src/interfaces.ts | 2 +- experimental/dds/tree/package.json | 1 - experimental/dds/tree/src/Checkout.ts | 3 +- experimental/dds/tree/src/EditLog.ts | 2 +- experimental/dds/tree/src/LogViewer.ts | 2 +- experimental/dds/tree/src/Transaction.ts | 2 +- experimental/dds/tree2/package.json | 1 - experimental/dds/tree2/src/events/events.ts | 4 +- .../shared-tree-core/sharedTreeCore.spec.ts | 2 +- .../framework/data-objects/package.json | 2 +- .../data-objects/src/signaler/signaler.ts | 2 +- .../framework/last-edited/package.json | 1 - .../framework/react-inputs/package.json | 2 +- .../react-inputs/src/SharedStringHelper.ts | 2 +- .../common/container-definitions/package.json | 1 - .../container-definitions/src/deltas.ts | 3 +- .../container-definitions/src/loader.ts | 10 +- packages/common/core-interfaces/src/events.ts | 430 ++++++++++++++++++ packages/common/core-interfaces/src/index.ts | 11 + .../common/driver-definitions/package.json | 1 - .../common/driver-definitions/src/storage.ts | 8 +- packages/dds/map/package.json | 1 - packages/dds/map/src/interfaces.ts | 8 +- packages/dds/matrix/package.json | 1 - packages/dds/merge-tree/package.json | 1 - packages/dds/merge-tree/src/client.ts | 3 +- packages/dds/pact-map/package.json | 1 - packages/dds/sequence/package.json | 1 - .../dds/sequence/src/defaultMapInterfaces.ts | 2 +- .../dds/sequence/src/intervalCollection.ts | 2 +- packages/dds/sequence/src/sequence.ts | 2 +- packages/dds/shared-object-base/package.json | 1 - .../shared-object-base/src/sharedObject.ts | 3 +- packages/dds/shared-object-base/src/types.ts | 2 +- packages/dds/task-manager/package.json | 1 - packages/drivers/odsp-driver/package.json | 1 - .../src/odspDocumentDeltaConnection.ts | 2 +- packages/drivers/replay-driver/package.json | 1 - .../drivers/routerlicious-driver/package.json | 1 - .../framework/agent-scheduler/package.json | 1 - .../framework/agent-scheduler/src/agent.ts | 3 +- .../agent-scheduler/src/taskSubscription.ts | 2 +- packages/framework/aqueduct/package.json | 1 - .../src/data-objects/pureDataObject.ts | 3 +- .../aqueduct/src/data-objects/types.ts | 3 +- .../app-insights-logger/package.json | 1 - .../src/fluidAppInsightsLogger.ts | 2 +- .../framework/data-object-base/package.json | 1 - .../src/lazyLoadedDataObject.ts | 2 +- packages/framework/fluid-static/package.json | 1 - .../fluid-static/src/fluidContainer.ts | 3 +- packages/framework/fluid-static/src/types.ts | 3 +- .../oldest-client-observer/package.json | 2 +- .../oldest-client-observer/src/interfaces.ts | 2 +- .../tinylicious-client/src/interfaces.ts | 2 +- packages/loader/container-loader/package.json | 1 - .../loader/container-loader/src/container.ts | 2 +- .../container-loader/src/deltaManager.ts | 7 +- .../loader/container-loader/src/disposal.ts | 4 +- .../container-loader/src/noopHeuristic.ts | 2 +- packages/loader/container-utils/package.json | 2 +- packages/loader/container-utils/src/error.ts | 2 +- .../loader/test-loader-utils/package.json | 1 - .../package.json | 1 - .../src/containerRuntime.ts | 2 +- .../runtime/container-runtime/package.json | 1 - .../container-runtime/src/batchTracker.ts | 2 +- .../src/dataStoreContexts.ts | 3 +- .../src/pendingStateManager.ts | 2 +- .../src/summary/orderedClientElection.ts | 3 +- .../src/summary/summarizerClientElection.ts | 2 +- .../src/summary/summarizerTypes.ts | 3 +- .../src/summary/summaryCollection.ts | 3 +- .../src/summary/summaryManager.ts | 8 +- .../src/test/dataStoreContext.spec.ts | 2 +- .../datastore-definitions/package.json | 1 - .../src/dataStoreRuntime.ts | 3 +- packages/runtime/datastore/package.json | 1 - .../runtime/runtime-definitions/package.json | 1 - .../src/dataStoreContext.ts | 3 +- .../runtime/test-runtime-utils/package.json | 1 - packages/test/mocha-test-setup/package.json | 1 - .../test-app-insights-logger/package.json | 1 - .../test/test-end-to-end-tests/package.json | 1 - packages/test/test-service-load/package.json | 1 - packages/test/test-version-utils/package.json | 1 - .../api-report/devtools-core.api.md | 4 +- .../tools/devtools/devtools-core/package.json | 1 - .../devtools-core/src/ContainerDevtools.ts | 2 +- .../devtools-core/src/FluidDevtools.ts | 4 +- .../devtools-core/src/IFluidDevtools.ts | 2 +- .../data-visualization/DataVisualization.ts | 2 +- .../src/messaging/MessageRelay.ts | 4 +- .../api-report/devtools-view.api.md | 4 +- .../tools/devtools/devtools-view/package.json | 2 +- .../devtools-view/src/DevtoolsPanel.tsx | 4 +- .../devtools-view/src/DevtoolsView.tsx | 2 +- .../devtools-view/src/TelemetryUtils.ts | 2 +- .../tools/devtools/devtools-view/src/index.ts | 2 +- packages/tools/devtools/devtools/package.json | 1 - packages/tools/devtools/devtools/src/index.ts | 2 +- packages/tools/fluid-runner/package.json | 1 - packages/tools/replay-tool/package.json | 1 - packages/utils/odsp-doclib-utils/package.json | 2 +- .../odsp-doclib-utils/src/odspErrorUtils.ts | 2 +- packages/utils/telemetry-utils/package.json | 1 - .../src/eventEmitterWithErrorHandling.ts | 2 +- .../src/sampledTelemetryHelper.ts | 2 +- pnpm-lock.yaml | 160 +------ 179 files changed, 902 insertions(+), 371 deletions(-) create mode 100644 .changeset/ready-games-sniff.md create mode 100644 packages/common/core-interfaces/src/events.ts diff --git a/.changeset/ready-games-sniff.md b/.changeset/ready-games-sniff.md new file mode 100644 index 000000000000..f9e8b96ae61a --- /dev/null +++ b/.changeset/ready-games-sniff.md @@ -0,0 +1,68 @@ +--- +"@fluidframework/agent-scheduler": minor +"@fluidframework/aqueduct": minor +"@fluid-experimental/attributable-map": minor +"@fluid-experimental/azure-scenario-runner": minor +"@fluidframework/container-definitions": minor +"@fluidframework/container-loader": minor +"@fluidframework/container-runtime": minor +"@fluidframework/container-runtime-definitions": minor +"@fluidframework/container-utils": minor +"@fluidframework/core-interfaces": minor +"@fluidframework/data-object-base": minor +"@fluid-experimental/data-objects": minor +"@fluidframework/datastore": minor +"@fluidframework/datastore-definitions": minor +"@fluid-experimental/devtools": minor +"@fluid-experimental/devtools-core": minor +"@fluidframework/driver-definitions": minor +"@fluidframework/fluid-runner": minor +"@fluidframework/fluid-static": minor +"@fluid-experimental/last-edited": minor +"@fluidframework/map": minor +"@fluidframework/matrix": minor +"@fluidframework/merge-tree": minor +"@fluidframework/mocha-test-setup": minor +"@fluidframework/odsp-doclib-utils": minor +"@fluidframework/odsp-driver": minor +"@fluid-experimental/oldest-client-observer": minor +"@fluid-experimental/pact-map": minor +"@fluid-experimental/react-inputs": minor +"@fluidframework/replay-driver": minor +"@fluidframework/routerlicious-driver": minor +"@fluidframework/runtime-definitions": minor +"@fluidframework/sequence": minor +"@fluidframework/shared-object-base": minor +"@fluidframework/task-manager": minor +"@fluidframework/telemetry-utils": minor +"@fluidframework/test-runtime-utils": minor +"@fluid-experimental/tree": minor +"@fluid-experimental/tree2": minor +--- + +Remove use of @fluidframework/common-definitions + +The **@fluidframework/common-definitions** package is being deprecated, so the following interfaces and types are now +imported from the **@fluidframework/core-interfaces** package: + +- interface IDisposable +- interface IErrorEvent +- interface IErrorEvent +- interface IEvent +- interface IEventProvider +- interface ILoggingError +- interface ITaggedTelemetryPropertyType +- interface ITelemetryBaseEvent +- interface ITelemetryBaseLogger +- interface ITelemetryErrorEvent +- interface ITelemetryGenericEvent +- interface ITelemetryLogger +- interface ITelemetryPerformanceEvent +- interface ITelemetryProperties +- type ExtendEventProvider +- type IEventThisPlaceHolder +- type IEventTransformer +- type ReplaceIEventThisPlaceHolder +- type ReplaceIEventThisPlaceHolder +- type TelemetryEventCategory +- type TelemetryEventPropertyType diff --git a/api-report/aqueduct.api.md b/api-report/aqueduct.api.md index 8e41b0af57f5..2c71fdc3037b 100644 --- a/api-report/aqueduct.api.md +++ b/api-report/aqueduct.api.md @@ -17,8 +17,8 @@ import { IContainerContext } from '@fluidframework/container-definitions'; import { IContainerRuntime } from '@fluidframework/container-runtime-definitions'; import { IContainerRuntimeBase } from '@fluidframework/runtime-definitions'; import { IContainerRuntimeOptions } from '@fluidframework/container-runtime'; -import { IEvent } from '@fluidframework/common-definitions'; -import { IEventProvider } from '@fluidframework/common-definitions'; +import { IEvent } from '@fluidframework/core-interfaces'; +import { IEventProvider } from '@fluidframework/core-interfaces'; import { IFluidDataStoreContext } from '@fluidframework/runtime-definitions'; import { IFluidDataStoreContextDetached } from '@fluidframework/runtime-definitions'; import { IFluidDataStoreFactory } from '@fluidframework/runtime-definitions'; diff --git a/api-report/attributable-map.api.md b/api-report/attributable-map.api.md index d098fd19918f..f991d6538e8d 100644 --- a/api-report/attributable-map.api.md +++ b/api-report/attributable-map.api.md @@ -9,7 +9,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 { IEventThisPlaceHolder } from '@fluidframework/common-definitions'; +import { IEventThisPlaceHolder } from '@fluidframework/core-interfaces'; import { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions'; import { IFluidHandle } from '@fluidframework/core-interfaces'; import { IFluidSerializer } from '@fluidframework/shared-object-base'; diff --git a/api-report/container-definitions.api.md b/api-report/container-definitions.api.md index 25f5f1a6e499..1781b793d373 100644 --- a/api-report/container-definitions.api.md +++ b/api-report/container-definitions.api.md @@ -13,9 +13,9 @@ import { IClientDetails } from '@fluidframework/protocol-definitions'; import { IDisposable } from '@fluidframework/core-interfaces'; import { IDocumentMessage } from '@fluidframework/protocol-definitions'; import { IDocumentStorageService } from '@fluidframework/driver-definitions'; -import { IErrorEvent } from '@fluidframework/common-definitions'; -import { IEvent } from '@fluidframework/common-definitions'; -import { IEventProvider } from '@fluidframework/common-definitions'; +import { IErrorEvent } from '@fluidframework/core-interfaces'; +import { IEvent } from '@fluidframework/core-interfaces'; +import { IEventProvider } from '@fluidframework/core-interfaces'; import { IFluidRouter } from '@fluidframework/core-interfaces'; import { IQuorumClients } from '@fluidframework/protocol-definitions'; import { IRequest } from '@fluidframework/core-interfaces'; diff --git a/api-report/container-runtime-definitions.api.md b/api-report/container-runtime-definitions.api.md index 10a4f3c23793..37ac4d293c48 100644 --- a/api-report/container-runtime-definitions.api.md +++ b/api-report/container-runtime-definitions.api.md @@ -14,7 +14,7 @@ import { IDataStore } from '@fluidframework/runtime-definitions'; import { IDeltaManager } from '@fluidframework/container-definitions'; import { IDocumentMessage } from '@fluidframework/protocol-definitions'; import { IDocumentStorageService } from '@fluidframework/driver-definitions'; -import { IEventProvider } from '@fluidframework/common-definitions'; +import { IEventProvider } from '@fluidframework/core-interfaces'; import { IFluidDataStoreContextDetached } from '@fluidframework/runtime-definitions'; import { IFluidHandle } from '@fluidframework/core-interfaces'; import { IFluidRouter } from '@fluidframework/core-interfaces'; diff --git a/api-report/container-runtime.api.md b/api-report/container-runtime.api.md index 81373a015cd9..6d22d0f10a68 100644 --- a/api-report/container-runtime.api.md +++ b/api-report/container-runtime.api.md @@ -21,8 +21,8 @@ import { IDeltaManager } from '@fluidframework/container-definitions'; import { IDisposable } from '@fluidframework/core-interfaces'; import { IDocumentMessage } from '@fluidframework/protocol-definitions'; import { IDocumentStorageService } from '@fluidframework/driver-definitions'; -import { IEvent } from '@fluidframework/common-definitions'; -import { IEventProvider } from '@fluidframework/common-definitions'; +import { IEvent } from '@fluidframework/core-interfaces'; +import { IEventProvider } from '@fluidframework/core-interfaces'; import { IFluidDataStoreContextDetached } from '@fluidframework/runtime-definitions'; import { IFluidDataStoreRegistry } from '@fluidframework/runtime-definitions'; import { IFluidHandle } from '@fluidframework/core-interfaces'; diff --git a/api-report/container-utils.api.md b/api-report/container-utils.api.md index 8fe4f1d6b485..b17dbfa8b768 100644 --- a/api-report/container-utils.api.md +++ b/api-report/container-utils.api.md @@ -18,7 +18,7 @@ import { IGenericError } from '@fluidframework/container-definitions'; import { ISequencedDocumentMessage } from '@fluidframework/protocol-definitions'; import { ISignalMessage } from '@fluidframework/protocol-definitions'; import { ITelemetryLoggerExt } from '@fluidframework/telemetry-utils'; -import { ITelemetryProperties } from '@fluidframework/common-definitions'; +import { ITelemetryProperties } from '@fluidframework/core-interfaces'; import { IThrottlingWarning } from '@fluidframework/container-definitions'; import { IUsageError } from '@fluidframework/container-definitions'; import { LoggingError } from '@fluidframework/telemetry-utils'; diff --git a/api-report/core-interfaces.api.md b/api-report/core-interfaces.api.md index 8b8beb382b7b..1e9eb88c7f1e 100644 --- a/api-report/core-interfaces.api.md +++ b/api-report/core-interfaces.api.md @@ -4,6 +4,9 @@ ```ts +// @public +export type ExtendEventProvider, TEvent extends TBaseEvent> = Omit, "once">, "off"> & IEventProvider & IEventProvider; + // @public export type FluidObject = { [P in FluidObjectProviderKeys]?: T[P]; @@ -21,6 +24,183 @@ export interface IDisposable { readonly disposed: boolean; } +// @public +export interface IErrorEvent extends IEvent { + // @eventProperty + (event: "error", listener: (message: any) => void): any; +} + +// @public +export interface IEvent { + // @eventProperty + (event: string, listener: (...args: any[]) => void): any; +} + +// @public +export interface IEventProvider { + readonly off: IEventTransformer; + readonly on: IEventTransformer; + readonly once: IEventTransformer; +} + +// @public +export type IEventThisPlaceHolder = { + thisPlaceHolder: "thisPlaceHolder"; +}; + +// @public +export type IEventTransformer = TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void): any; + (event: infer E1, listener: (...args: infer A1) => void): any; + (event: infer E2, listener: (...args: infer A2) => void): any; + (event: infer E3, listener: (...args: infer A3) => void): any; + (event: infer E4, listener: (...args: infer A4) => void): any; + (event: infer E5, listener: (...args: infer A5) => void): any; + (event: infer E6, listener: (...args: infer A6) => void): any; + (event: infer E7, listener: (...args: infer A7) => void): any; + (event: infer E8, listener: (...args: infer A8) => void): any; + (event: infer E9, listener: (...args: infer A9) => void): any; + (event: infer E10, listener: (...args: infer A10) => void): any; + (event: infer E11, listener: (...args: infer A11) => void): any; + (event: infer E12, listener: (...args: infer A12) => void): any; + (event: infer E13, listener: (...args: infer A13) => void): any; + (event: infer E14, listener: (...args: infer A14) => void): any; + (event: string, listener: (...args: any[]) => void): any; +} ? TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void): any; + (event: infer E1, listener: (...args: infer A1) => void): any; + (event: infer E2, listener: (...args: infer A2) => void): any; + (event: infer E3, listener: (...args: infer A3) => void): any; + (event: infer E4, listener: (...args: infer A4) => void): any; + (event: infer E5, listener: (...args: infer A5) => void): any; + (event: infer E6, listener: (...args: infer A6) => void): any; + (event: infer E7, listener: (...args: infer A7) => void): any; + (event: infer E8, listener: (...args: infer A8) => void): any; + (event: infer E9, listener: (...args: infer A9) => void): any; + (event: infer E10, listener: (...args: infer A10) => void): any; + (event: infer E11, listener: (...args: infer A11) => void): any; + (event: infer E12, listener: (...args: infer A12) => void): any; + (event: infer E13, listener: (...args: infer A13) => void): any; + (event: string, listener: (...args: any[]) => void): any; +} ? TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void): any; + (event: infer E1, listener: (...args: infer A1) => void): any; + (event: infer E2, listener: (...args: infer A2) => void): any; + (event: infer E3, listener: (...args: infer A3) => void): any; + (event: infer E4, listener: (...args: infer A4) => void): any; + (event: infer E5, listener: (...args: infer A5) => void): any; + (event: infer E6, listener: (...args: infer A6) => void): any; + (event: infer E7, listener: (...args: infer A7) => void): any; + (event: infer E8, listener: (...args: infer A8) => void): any; + (event: infer E9, listener: (...args: infer A9) => void): any; + (event: infer E10, listener: (...args: infer A10) => void): any; + (event: infer E11, listener: (...args: infer A11) => void): any; + (event: infer E12, listener: (...args: infer A12) => void): any; + (event: string, listener: (...args: any[]) => void): any; +} ? TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void): any; + (event: infer E1, listener: (...args: infer A1) => void): any; + (event: infer E2, listener: (...args: infer A2) => void): any; + (event: infer E3, listener: (...args: infer A3) => void): any; + (event: infer E4, listener: (...args: infer A4) => void): any; + (event: infer E5, listener: (...args: infer A5) => void): any; + (event: infer E6, listener: (...args: infer A6) => void): any; + (event: infer E7, listener: (...args: infer A7) => void): any; + (event: infer E8, listener: (...args: infer A8) => void): any; + (event: infer E9, listener: (...args: infer A9) => void): any; + (event: infer E10, listener: (...args: infer A10) => void): any; + (event: infer E11, listener: (...args: infer A11) => void): any; + (event: string, listener: (...args: any[]) => void): any; +} ? TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void): any; + (event: infer E1, listener: (...args: infer A1) => void): any; + (event: infer E2, listener: (...args: infer A2) => void): any; + (event: infer E3, listener: (...args: infer A3) => void): any; + (event: infer E4, listener: (...args: infer A4) => void): any; + (event: infer E5, listener: (...args: infer A5) => void): any; + (event: infer E6, listener: (...args: infer A6) => void): any; + (event: infer E7, listener: (...args: infer A7) => void): any; + (event: infer E8, listener: (...args: infer A8) => void): any; + (event: infer E9, listener: (...args: infer A9) => void): any; + (event: infer E10, listener: (...args: infer A10) => void): any; + (event: string, listener: (...args: any[]) => void): any; +} ? TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void): any; + (event: infer E1, listener: (...args: infer A1) => void): any; + (event: infer E2, listener: (...args: infer A2) => void): any; + (event: infer E3, listener: (...args: infer A3) => void): any; + (event: infer E4, listener: (...args: infer A4) => void): any; + (event: infer E5, listener: (...args: infer A5) => void): any; + (event: infer E6, listener: (...args: infer A6) => void): any; + (event: infer E7, listener: (...args: infer A7) => void): any; + (event: infer E8, listener: (...args: infer A8) => void): any; + (event: infer E9, listener: (...args: infer A9) => void): any; + (event: string, listener: (...args: any[]) => void): any; +} ? TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void): any; + (event: infer E1, listener: (...args: infer A1) => void): any; + (event: infer E2, listener: (...args: infer A2) => void): any; + (event: infer E3, listener: (...args: infer A3) => void): any; + (event: infer E4, listener: (...args: infer A4) => void): any; + (event: infer E5, listener: (...args: infer A5) => void): any; + (event: infer E6, listener: (...args: infer A6) => void): any; + (event: infer E7, listener: (...args: infer A7) => void): any; + (event: infer E8, listener: (...args: infer A8) => void): any; + (event: string, listener: (...args: any[]) => void): any; +} ? TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void): any; + (event: infer E1, listener: (...args: infer A1) => void): any; + (event: infer E2, listener: (...args: infer A2) => void): any; + (event: infer E3, listener: (...args: infer A3) => void): any; + (event: infer E4, listener: (...args: infer A4) => void): any; + (event: infer E5, listener: (...args: infer A5) => void): any; + (event: infer E6, listener: (...args: infer A6) => void): any; + (event: infer E7, listener: (...args: infer A7) => void): any; + (event: string, listener: (...args: any[]) => void): any; +} ? TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void): any; + (event: infer E1, listener: (...args: infer A1) => void): any; + (event: infer E2, listener: (...args: infer A2) => void): any; + (event: infer E3, listener: (...args: infer A3) => void): any; + (event: infer E4, listener: (...args: infer A4) => void): any; + (event: infer E5, listener: (...args: infer A5) => void): any; + (event: infer E6, listener: (...args: infer A6) => void): any; + (event: string, listener: (...args: any[]) => void): any; +} ? TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void): any; + (event: infer E1, listener: (...args: infer A1) => void): any; + (event: infer E2, listener: (...args: infer A2) => void): any; + (event: infer E3, listener: (...args: infer A3) => void): any; + (event: infer E4, listener: (...args: infer A4) => void): any; + (event: infer E5, listener: (...args: infer A5) => void): any; + (event: string, listener: (...args: any[]) => void): any; +} ? TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void): any; + (event: infer E1, listener: (...args: infer A1) => void): any; + (event: infer E2, listener: (...args: infer A2) => void): any; + (event: infer E3, listener: (...args: infer A3) => void): any; + (event: infer E4, listener: (...args: infer A4) => void): any; + (event: string, listener: (...args: any[]) => void): any; +} ? TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void): any; + (event: infer E1, listener: (...args: infer A1) => void): any; + (event: infer E2, listener: (...args: infer A2) => void): any; + (event: infer E3, listener: (...args: infer A3) => void): any; + (event: string, listener: (...args: any[]) => void): any; +} ? TransformedEvent & TransformedEvent & TransformedEvent & TransformedEvent : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void): any; + (event: infer E1, listener: (...args: infer A1) => void): any; + (event: infer E2, listener: (...args: infer A2) => void): any; + (event: string, listener: (...args: any[]) => void): any; +} ? TransformedEvent & TransformedEvent & TransformedEvent : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void): any; + (event: infer E1, listener: (...args: infer A1) => void): any; + (event: string, listener: (...args: any[]) => void): any; +} ? TransformedEvent & TransformedEvent : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void): any; + (event: string, listener: (...args: any[]) => void): any; +} ? TransformedEvent : TransformedEvent; + // @public @deprecated export interface IFluidCodeDetails { readonly config?: IFluidCodeDetailsConfig; @@ -249,12 +429,20 @@ export interface ITelemetryProperties { [index: string]: TelemetryEventPropertyType | ITaggedTelemetryPropertyType; } +// @public +export type ReplaceIEventThisPlaceHolder = L extends any[] ? { + [K in keyof L]: L[K] extends IEventThisPlaceHolder ? TThis : L[K]; +} : L; + // @public export type TelemetryEventCategory = "generic" | "error" | "performance"; // @public export type TelemetryEventPropertyType = string | number | boolean | undefined; +// @public +export type TransformedEvent = (event: E, listener: (...args: ReplaceIEventThisPlaceHolder) => void) => TThis; + // (No @packageDocumentation comment for this package) ``` diff --git a/api-report/data-object-base.api.md b/api-report/data-object-base.api.md index b0a83256b5a9..7813e7af1623 100644 --- a/api-report/data-object-base.api.md +++ b/api-report/data-object-base.api.md @@ -11,7 +11,7 @@ import { FluidObject } from '@fluidframework/core-interfaces'; import { IChannelFactory } from '@fluidframework/datastore-definitions'; import { IContainerContext } from '@fluidframework/container-definitions'; import { IContainerRuntime } from '@fluidframework/container-runtime-definitions'; -import { IEvent } from '@fluidframework/common-definitions'; +import { IEvent } from '@fluidframework/core-interfaces'; import { IFluidDataStoreContext } from '@fluidframework/runtime-definitions'; import { IFluidDataStoreFactory } from '@fluidframework/runtime-definitions'; import { IFluidDataStoreRegistry } from '@fluidframework/runtime-definitions'; diff --git a/api-report/datastore-definitions.api.md b/api-report/datastore-definitions.api.md index 60119b559689..f0fda92f0e20 100644 --- a/api-report/datastore-definitions.api.md +++ b/api-report/datastore-definitions.api.md @@ -10,8 +10,8 @@ import { IAudience } from '@fluidframework/container-definitions'; import { IDeltaManager } from '@fluidframework/container-definitions'; import { IDisposable } from '@fluidframework/core-interfaces'; import { IDocumentMessage } from '@fluidframework/protocol-definitions'; -import { IEvent } from '@fluidframework/common-definitions'; -import { IEventProvider } from '@fluidframework/common-definitions'; +import { IEvent } from '@fluidframework/core-interfaces'; +import { IEventProvider } from '@fluidframework/core-interfaces'; import { IExperimentalIncrementalSummaryContext } from '@fluidframework/runtime-definitions'; import { IFluidHandle } from '@fluidframework/core-interfaces'; import { IFluidHandleContext } from '@fluidframework/core-interfaces'; diff --git a/api-report/driver-definitions.api.md b/api-report/driver-definitions.api.md index 9ca7d09b6652..c2162e303944 100644 --- a/api-report/driver-definitions.api.md +++ b/api-report/driver-definitions.api.md @@ -10,8 +10,8 @@ import { IClientConfiguration } from '@fluidframework/protocol-definitions'; import { ICreateBlobResponse } from '@fluidframework/protocol-definitions'; import { IDisposable } from '@fluidframework/core-interfaces'; import { IDocumentMessage } from '@fluidframework/protocol-definitions'; -import { IErrorEvent } from '@fluidframework/common-definitions'; -import { IEventProvider } from '@fluidframework/common-definitions'; +import { IErrorEvent } from '@fluidframework/core-interfaces'; +import { IEventProvider } from '@fluidframework/core-interfaces'; import { INack } from '@fluidframework/protocol-definitions'; import { IRequest } from '@fluidframework/core-interfaces'; import { ISequencedDocumentMessage } from '@fluidframework/protocol-definitions'; diff --git a/api-report/experimental-tree.api.md b/api-report/experimental-tree.api.md index d263b73c2be5..d5b890ff459d 100644 --- a/api-report/experimental-tree.api.md +++ b/api-report/experimental-tree.api.md @@ -11,7 +11,7 @@ import { IChannelFactory } from '@fluidframework/datastore-definitions'; import { IChannelServices } from '@fluidframework/datastore-definitions'; import { IChannelStorageService } from '@fluidframework/datastore-definitions'; import { IDisposable } from '@fluidframework/core-interfaces'; -import { IErrorEvent } from '@fluidframework/common-definitions'; +import { IErrorEvent } from '@fluidframework/core-interfaces'; import { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions'; import { IFluidSerializer } from '@fluidframework/shared-object-base'; import { ISharedObjectEvents } from '@fluidframework/shared-object-base'; diff --git a/api-report/fluid-static.api.md b/api-report/fluid-static.api.md index 2c46e31f5de2..afcb438f521e 100644 --- a/api-report/fluid-static.api.md +++ b/api-report/fluid-static.api.md @@ -13,8 +13,8 @@ import { IClient } from '@fluidframework/protocol-definitions'; import { IContainer } from '@fluidframework/container-definitions'; import { IContainerRuntime } from '@fluidframework/container-runtime-definitions'; import { ICriticalContainerError } from '@fluidframework/container-definitions'; -import { IEvent } from '@fluidframework/common-definitions'; -import { IEventProvider } from '@fluidframework/common-definitions'; +import { IEvent } from '@fluidframework/core-interfaces'; +import { IEventProvider } from '@fluidframework/core-interfaces'; import { IFluidDataStoreFactory } from '@fluidframework/runtime-definitions'; import { IFluidLoadable } from '@fluidframework/core-interfaces'; import { TypedEventEmitter } from '@fluidframework/common-utils'; diff --git a/api-report/map.api.md b/api-report/map.api.md index a3416166441e..c59a9e23b6c4 100644 --- a/api-report/map.api.md +++ b/api-report/map.api.md @@ -9,9 +9,9 @@ import { IChannelFactory } from '@fluidframework/datastore-definitions'; import { IChannelServices } from '@fluidframework/datastore-definitions'; import { IChannelStorageService } from '@fluidframework/datastore-definitions'; import { IDisposable } from '@fluidframework/core-interfaces'; -import { IEvent } from '@fluidframework/common-definitions'; -import { IEventProvider } from '@fluidframework/common-definitions'; -import { IEventThisPlaceHolder } from '@fluidframework/common-definitions'; +import { IEvent } from '@fluidframework/core-interfaces'; +import { IEventProvider } from '@fluidframework/core-interfaces'; +import { IEventThisPlaceHolder } from '@fluidframework/core-interfaces'; import { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions'; import { IFluidHandle } from '@fluidframework/core-interfaces'; import { IFluidSerializer } from '@fluidframework/shared-object-base'; diff --git a/api-report/merge-tree.api.md b/api-report/merge-tree.api.md index 59d2fb5397e5..652e697ebc73 100644 --- a/api-report/merge-tree.api.md +++ b/api-report/merge-tree.api.md @@ -6,7 +6,7 @@ import { AttributionKey } from '@fluidframework/runtime-definitions'; import { IChannelStorageService } from '@fluidframework/datastore-definitions'; -import type { IEventThisPlaceHolder } from '@fluidframework/common-definitions'; +import { IEventThisPlaceHolder } from '@fluidframework/core-interfaces'; import { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions'; import { IFluidHandle } from '@fluidframework/core-interfaces'; import { IFluidSerializer } from '@fluidframework/shared-object-base'; diff --git a/api-report/oldest-client-observer.api.md b/api-report/oldest-client-observer.api.md index b1d6fd3015a8..421374a4dad6 100644 --- a/api-report/oldest-client-observer.api.md +++ b/api-report/oldest-client-observer.api.md @@ -5,8 +5,8 @@ ```ts import { AttachState } from '@fluidframework/container-definitions'; -import { IEvent } from '@fluidframework/common-definitions'; -import { IEventProvider } from '@fluidframework/common-definitions'; +import { IEvent } from '@fluidframework/core-interfaces'; +import { IEventProvider } from '@fluidframework/core-interfaces'; import { IQuorumClients } from '@fluidframework/protocol-definitions'; import { TypedEventEmitter } from '@fluidframework/common-utils'; diff --git a/api-report/runtime-definitions.api.md b/api-report/runtime-definitions.api.md index c698cd0eab03..21a0a57d5553 100644 --- a/api-report/runtime-definitions.api.md +++ b/api-report/runtime-definitions.api.md @@ -12,8 +12,8 @@ import { IDeltaManager } from '@fluidframework/container-definitions'; import { IDisposable } from '@fluidframework/core-interfaces'; import { IDocumentMessage } from '@fluidframework/protocol-definitions'; import { IDocumentStorageService } from '@fluidframework/driver-definitions'; -import { IEvent } from '@fluidframework/common-definitions'; -import { IEventProvider } from '@fluidframework/common-definitions'; +import { IEvent } from '@fluidframework/core-interfaces'; +import { IEventProvider } from '@fluidframework/core-interfaces'; import { IFluidHandle } from '@fluidframework/core-interfaces'; import { IFluidRouter } from '@fluidframework/core-interfaces'; import { ILoaderOptions } from '@fluidframework/container-definitions'; diff --git a/api-report/sequence.api.md b/api-report/sequence.api.md index bd4c89d6af3d..c0aadcbc3c18 100644 --- a/api-report/sequence.api.md +++ b/api-report/sequence.api.md @@ -12,8 +12,8 @@ import { IChannelFactory } from '@fluidframework/datastore-definitions'; import { IChannelServices } from '@fluidframework/datastore-definitions'; import { IChannelStorageService } from '@fluidframework/datastore-definitions'; import { ICombiningOp } from '@fluidframework/merge-tree'; -import { IEvent } from '@fluidframework/common-definitions'; -import { IEventThisPlaceHolder } from '@fluidframework/common-definitions'; +import { IEvent } from '@fluidframework/core-interfaces'; +import { IEventThisPlaceHolder } from '@fluidframework/core-interfaces'; import { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions'; import { IFluidSerializer } from '@fluidframework/shared-object-base'; import { IJSONSegment } from '@fluidframework/merge-tree'; diff --git a/api-report/shared-object-base.api.md b/api-report/shared-object-base.api.md index f46aad517406..bae1545ee3ae 100644 --- a/api-report/shared-object-base.api.md +++ b/api-report/shared-object-base.api.md @@ -10,9 +10,9 @@ import { IChannel } from '@fluidframework/datastore-definitions'; import { IChannelAttributes } from '@fluidframework/datastore-definitions'; import { IChannelServices } from '@fluidframework/datastore-definitions'; import { IChannelStorageService } from '@fluidframework/datastore-definitions'; -import { IErrorEvent } from '@fluidframework/common-definitions'; -import { IEventProvider } from '@fluidframework/common-definitions'; -import { IEventThisPlaceHolder } from '@fluidframework/common-definitions'; +import { IErrorEvent } from '@fluidframework/core-interfaces'; +import { IEventProvider } from '@fluidframework/core-interfaces'; +import { IEventThisPlaceHolder } from '@fluidframework/core-interfaces'; import { IExperimentalIncrementalSummaryContext } from '@fluidframework/runtime-definitions'; import { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions'; import { IFluidHandle } from '@fluidframework/core-interfaces'; diff --git a/api-report/telemetry-utils.api.md b/api-report/telemetry-utils.api.md index 5677f0af1d80..0f0b15acc877 100644 --- a/api-report/telemetry-utils.api.md +++ b/api-report/telemetry-utils.api.md @@ -7,7 +7,7 @@ import { EventEmitter } from 'events'; import { EventEmitterEventType } from '@fluidframework/common-utils'; import { IDisposable } from '@fluidframework/core-interfaces'; -import { IEvent } from '@fluidframework/common-definitions'; +import { IEvent } from '@fluidframework/core-interfaces'; import { ILoggingError } from '@fluidframework/core-interfaces'; import { ITaggedTelemetryPropertyType } from '@fluidframework/core-interfaces'; import { ITelemetryBaseEvent } from '@fluidframework/core-interfaces'; diff --git a/azure/packages/external-controller/package.json b/azure/packages/external-controller/package.json index ab2d9f20b346..b1a27357403e 100644 --- a/azure/packages/external-controller/package.json +++ b/azure/packages/external-controller/package.json @@ -43,7 +43,6 @@ }, "dependencies": { "@fluidframework/azure-client": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/routerlicious-driver": "workspace:~", "@fluidframework/telemetry-utils": "workspace:~", "assert": "^2.0.0", diff --git a/azure/packages/test/scenario-runner/package.json b/azure/packages/test/scenario-runner/package.json index 52c48c7adac5..44bc592fab47 100644 --- a/azure/packages/test/scenario-runner/package.json +++ b/azure/packages/test/scenario-runner/package.json @@ -63,7 +63,6 @@ "dependencies": { "@fluidframework/aqueduct": "workspace:~", "@fluidframework/azure-client": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-loader": "workspace:~", diff --git a/azure/packages/test/scenario-runner/src/interface.ts b/azure/packages/test/scenario-runner/src/interface.ts index 083694f37768..99323c5359d5 100644 --- a/azure/packages/test/scenario-runner/src/interface.ts +++ b/azure/packages/test/scenario-runner/src/interface.ts @@ -3,8 +3,7 @@ * Licensed under the MIT License. */ import { AzureClient } from "@fluidframework/azure-client"; -import { IEvent, IEventProvider } from "@fluidframework/common-definitions"; -import { ITelemetryLogger } from "@fluidframework/core-interfaces"; +import { IEvent, IEventProvider, ITelemetryLogger } from "@fluidframework/core-interfaces"; import { CommanderStatic } from "commander"; export enum RunnerStatus { diff --git a/azure/packages/test/scenario-runner/src/logger.ts b/azure/packages/test/scenario-runner/src/logger.ts index 8571f7d5b80b..5d37a764cb22 100644 --- a/azure/packages/test/scenario-runner/src/logger.ts +++ b/azure/packages/test/scenario-runner/src/logger.ts @@ -5,13 +5,12 @@ import crypto from "crypto"; import fs from "fs"; -import { IEvent, ITelemetryBaseEvent } from "@fluidframework/common-definitions"; import { TypedEventEmitter, assert } from "@fluidframework/common-utils"; +import { IEvent, ITelemetryBaseEvent, ITelemetryLogger } from "@fluidframework/core-interfaces"; import { LazyPromise } from "@fluidframework/core-utils"; import { createChildLogger } from "@fluidframework/telemetry-utils"; import { ITelemetryBufferedLogger } from "@fluidframework/test-driver-definitions"; -import { ITelemetryLogger } from "@fluidframework/core-interfaces"; import { pkgName, pkgVersion } from "./packageVersion"; import { ScenarioRunnerTelemetryEventNames, getAzureClientConnectionConfigFromEnv } from "./utils"; diff --git a/common/lib/common-definitions/CHANGELOG.md b/common/lib/common-definitions/CHANGELOG.md index 817eabe5ea02..989cdb86e22a 100644 --- a/common/lib/common-definitions/CHANGELOG.md +++ b/common/lib/common-definitions/CHANGELOG.md @@ -1,14 +1,21 @@ # @fluidframework/common-definitions Changelog -## [1.2.0](https://github.com/microsoft/FluidFramework/releases/tag/common-definitions_v1.2.0) +## [1.0.0](https://github.com/microsoft/FluidFramework/releases/tag/common-definitions_v1.0.0) ### Deprecated interfaces and types -The following interfaces and types are deprecated in this release. Their replacements have been moved to another package. +The following interfaces and types are deprecated in this release. They can now be found in +@fluidframework/core-interfaces. + +These deprecated APIs will be removed in version 2.0.0. #### Moved to @fluidframework/core-interfaces - interface IDisposable +- interface IErrorEvent +- interface IErrorEvent +- interface IEvent +- interface IEventProvider - interface ILoggingError - interface ITaggedTelemetryPropertyType - interface ITelemetryBaseEvent @@ -18,5 +25,10 @@ The following interfaces and types are deprecated in this release. Their replace - interface ITelemetryLogger - interface ITelemetryPerformanceEvent - interface ITelemetryProperties +- type ExtendEventProvider +- type IEventThisPlaceHolder +- type IEventTransformer +- type ReplaceIEventThisPlaceHolder +- type ReplaceIEventThisPlaceHolder - type TelemetryEventCategory - type TelemetryEventPropertyType diff --git a/common/lib/common-definitions/api-report/common-definitions.api.md b/common/lib/common-definitions/api-report/common-definitions.api.md index 72ad506886b5..104a7d44d8fd 100644 --- a/common/lib/common-definitions/api-report/common-definitions.api.md +++ b/common/lib/common-definitions/api-report/common-definitions.api.md @@ -4,7 +4,7 @@ ```ts -// @public +// @public @deprecated export type ExtendEventProvider, TEvent extends TBaseEvent> = Omit, "once">, "off"> & IEventProvider & IEventProvider; // @public @deprecated @@ -13,31 +13,31 @@ export interface IDisposable { readonly disposed: boolean; } -// @public +// @public @deprecated export interface IErrorEvent extends IEvent { // @eventProperty (event: "error", listener: (message: any) => void): any; } -// @public +// @public @deprecated export interface IEvent { // @eventProperty (event: string, listener: (...args: any[]) => void): any; } -// @public +// @public @deprecated export interface IEventProvider { readonly off: IEventTransformer; readonly on: IEventTransformer; readonly once: IEventTransformer; } -// @public +// @public @deprecated export type IEventThisPlaceHolder = { thisPlaceHolder: "thisPlaceHolder"; }; -// @public +// @public @deprecated export type IEventTransformer = TEvent extends { (event: infer E0, listener: (...args: infer A0) => void): any; (event: infer E1, listener: (...args: infer A1) => void): any; @@ -251,7 +251,7 @@ export interface ITelemetryProperties { [index: string]: TelemetryEventPropertyType | ITaggedTelemetryPropertyType; } -// @public +// @public @deprecated export type ReplaceIEventThisPlaceHolder = L extends any[] ? { [K in keyof L]: L[K] extends IEventThisPlaceHolder ? TThis : L[K]; } : L; @@ -262,7 +262,7 @@ export type TelemetryEventCategory = "generic" | "error" | "performance"; // @public @deprecated export type TelemetryEventPropertyType = string | number | boolean | undefined; -// @public +// @public @deprecated export type TransformedEvent = (event: E, listener: (...args: ReplaceIEventThisPlaceHolder) => void) => TThis; ``` diff --git a/common/lib/common-definitions/src/events.ts b/common/lib/common-definitions/src/events.ts index e7e065a674f9..bf8b66dfee7c 100644 --- a/common/lib/common-definitions/src/events.ts +++ b/common/lib/common-definitions/src/events.ts @@ -5,6 +5,8 @@ /** * Base interface for event emitters. + * + * @deprecated Use {@link @fluidframework/core-interfaces#IEvent} instead. */ export interface IEvent { /** @@ -23,6 +25,8 @@ export interface IEvent { /** * Base interface for error event emitters. + * + * @deprecated Use {@link @fluidframework/core-interfaces#IErrorEvent} instead. */ export interface IErrorEvent extends IEvent { /** @@ -36,6 +40,8 @@ export interface IErrorEvent extends IEvent { /** * Base interface for event providers. + * + * @deprecated Use {@link @fluidframework/core-interfaces#IEventProvider} instead. */ export interface IEventProvider { /** @@ -75,6 +81,7 @@ export interface IEventProvider { * ``` * interface B will now extend interface A and its events * + * @deprecated Use {@link @fluidframework/core-interfaces#ExtendEventProvider} instead. */ export type ExtendEventProvider< TBaseEvent extends IEvent, @@ -96,12 +103,16 @@ export type ExtendEventProvider< /** * The placeholder type that should be used instead of `this` in events. + * + * @deprecated Use {@link @fluidframework/core-interfaces#IEventThisPlaceholder} instead. */ // eslint-disable-next-line @typescript-eslint/consistent-type-definitions export type IEventThisPlaceHolder = { thisPlaceHolder: "thisPlaceHolder" }; /** * Does the type replacement by changing types of {@link IEventThisPlaceHolder} to `TThis` + * + * @deprecated Use {@link @fluidframework/core-interfaces#ReplaceIEventThisPlaceHolder} instead. */ // eslint-disable-next-line @typescript-eslint/no-explicit-any export type ReplaceIEventThisPlaceHolder = L extends any[] @@ -111,6 +122,8 @@ export type ReplaceIEventThisPlaceHolder = L extends any /** * Transforms the event overload by replacing {@link IEventThisPlaceHolder} with `TThis` in the event listener * arguments and having the overload return `TTHis` as well + * + * @deprecated Use {@link @fluidframework/core-interfaces#TransformedEvent} instead. */ // eslint-disable-next-line @typescript-eslint/no-explicit-any export type TransformedEvent = ( @@ -126,6 +139,8 @@ export type TransformedEvent = ( * It currently supports the max of 15 event overloads which is more than we use anywhere. * At more than 15 overloads we start to hit {@link https://github.com/microsoft/TypeScript/issues/37209 | TS2589}. * If we need to move beyond 15 we should evaluate using a mapped type pattern like `{"event":(listenerArgs)=>void}` + * + * @deprecated Use {@link @fluidframework/core-interfaces#IEventTransformer} instead. */ export type IEventTransformer = TEvent extends { (event: infer E0, listener: (...args: infer A0) => void); diff --git a/docs/content/docs/testing/telemetry.md b/docs/content/docs/testing/telemetry.md index 5b1171df308f..082e551d7d27 100644 --- a/docs/content/docs/testing/telemetry.md +++ b/docs/content/docs/testing/telemetry.md @@ -223,7 +223,7 @@ suggests, the `ConsoleLogger` defined the `send()` method to stringify the entir browser console. ```ts -import { ITelemetryBaseLogger, ITelemetryBaseEvent } from "@fluidframework/common-definitions"; +import { ITelemetryBaseLogger, ITelemetryBaseEvent } from "@fluidframework/core-interfaces"; // Define a custom ITelemetry Logger. This logger will be passed into TinyliciousClient // and gets hooked up to the Tinylicious container telemetry system. diff --git a/examples/apps/attributable-map/package.json b/examples/apps/attributable-map/package.json index de437fe5b242..08cc4c615e22 100644 --- a/examples/apps/attributable-map/package.json +++ b/examples/apps/attributable-map/package.json @@ -36,7 +36,6 @@ "@fluid-experimental/attributable-map": "workspace:~", "@fluid-experimental/attributor": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-runtime": "workspace:~", "@fluidframework/container-runtime-definitions": "workspace:~", diff --git a/examples/apps/collaborative-textarea/package.json b/examples/apps/collaborative-textarea/package.json index eb624759dcad..738fd01d74e3 100644 --- a/examples/apps/collaborative-textarea/package.json +++ b/examples/apps/collaborative-textarea/package.json @@ -39,7 +39,6 @@ "@fluid-example/example-utils": "workspace:~", "@fluid-experimental/react-inputs": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-runtime-definitions": "workspace:~", "@fluidframework/core-interfaces": "workspace:~", diff --git a/examples/apps/contact-collection/package.json b/examples/apps/contact-collection/package.json index be4f1adf05ca..10b594712ead 100644 --- a/examples/apps/contact-collection/package.json +++ b/examples/apps/contact-collection/package.json @@ -38,7 +38,6 @@ "dependencies": { "@fluid-example/example-utils": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-runtime-definitions": "workspace:~", "@fluidframework/core-interfaces": "workspace:~", diff --git a/examples/apps/data-object-grid/package.json b/examples/apps/data-object-grid/package.json index 510e99c9a4db..820c21f0f788 100644 --- a/examples/apps/data-object-grid/package.json +++ b/examples/apps/data-object-grid/package.json @@ -47,7 +47,6 @@ "@fluid-example/multiview-slider-coordinate-view": "workspace:~", "@fluid-example/prosemirror": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-runtime-definitions": "workspace:~", "@fluidframework/core-interfaces": "workspace:~", diff --git a/examples/apps/presence-tracker/package.json b/examples/apps/presence-tracker/package.json index c472e70f1585..30dce1a2d854 100644 --- a/examples/apps/presence-tracker/package.json +++ b/examples/apps/presence-tracker/package.json @@ -38,10 +38,10 @@ "dependencies": { "@fluid-example/example-utils": "workspace:~", "@fluid-experimental/data-objects": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-runtime-definitions": "workspace:~", + "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/protocol-definitions": "^1.1.0", "@fluidframework/runtime-utils": "workspace:~", "@fluidframework/tinylicious-client": "workspace:~", diff --git a/examples/apps/presence-tracker/src/FocusTracker.ts b/examples/apps/presence-tracker/src/FocusTracker.ts index 84e133f53db8..cc67b424c1b6 100644 --- a/examples/apps/presence-tracker/src/FocusTracker.ts +++ b/examples/apps/presence-tracker/src/FocusTracker.ts @@ -4,7 +4,7 @@ */ import { Signaler } from "@fluid-experimental/data-objects"; -import { IEvent } from "@fluidframework/common-definitions"; +import { IEvent } from "@fluidframework/core-interfaces"; import { TypedEventEmitter } from "@fluidframework/common-utils"; import { IContainer } from "@fluidframework/container-definitions"; import { ITinyliciousAudience } from "@fluidframework/tinylicious-client"; diff --git a/examples/apps/presence-tracker/src/MouseTracker.ts b/examples/apps/presence-tracker/src/MouseTracker.ts index 8d0185095fc1..c9b30e754b26 100644 --- a/examples/apps/presence-tracker/src/MouseTracker.ts +++ b/examples/apps/presence-tracker/src/MouseTracker.ts @@ -4,7 +4,7 @@ */ import { Signaler } from "@fluid-experimental/data-objects"; -import { IEvent } from "@fluidframework/common-definitions"; +import { IEvent } from "@fluidframework/core-interfaces"; import { TypedEventEmitter } from "@fluidframework/common-utils"; import { IMember, IServiceAudience } from "fluid-framework"; diff --git a/examples/apps/task-selection/package.json b/examples/apps/task-selection/package.json index e62e5b25c600..bf6f92954e8f 100644 --- a/examples/apps/task-selection/package.json +++ b/examples/apps/task-selection/package.json @@ -39,7 +39,6 @@ "@fluid-example/example-utils": "workspace:~", "@fluid-experimental/oldest-client-observer": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-runtime-definitions": "workspace:~", diff --git a/examples/benchmarks/bubblebench/baseline/package.json b/examples/benchmarks/bubblebench/baseline/package.json index 74279bafed8e..56f5bbd123ef 100644 --- a/examples/benchmarks/bubblebench/baseline/package.json +++ b/examples/benchmarks/bubblebench/baseline/package.json @@ -44,7 +44,6 @@ "@fluid-example/bubblebench-common": "workspace:~", "@fluid-example/example-utils": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/datastore-definitions": "workspace:~", diff --git a/examples/benchmarks/bubblebench/editable-shared-tree/package.json b/examples/benchmarks/bubblebench/editable-shared-tree/package.json index b87cfe549602..5bbc22c3333b 100644 --- a/examples/benchmarks/bubblebench/editable-shared-tree/package.json +++ b/examples/benchmarks/bubblebench/editable-shared-tree/package.json @@ -46,7 +46,6 @@ "@fluid-experimental/tree": "workspace:~", "@fluid-experimental/tree2": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/datastore-definitions": "workspace:~", diff --git a/examples/benchmarks/bubblebench/ot/package.json b/examples/benchmarks/bubblebench/ot/package.json index cb202e9c7079..88ad03590216 100644 --- a/examples/benchmarks/bubblebench/ot/package.json +++ b/examples/benchmarks/bubblebench/ot/package.json @@ -45,7 +45,6 @@ "@fluid-example/example-utils": "workspace:~", "@fluid-experimental/sharejs-json1": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/datastore-definitions": "workspace:~", diff --git a/examples/benchmarks/bubblebench/sharedtree/package.json b/examples/benchmarks/bubblebench/sharedtree/package.json index b13b245da182..7b7cad4a9643 100644 --- a/examples/benchmarks/bubblebench/sharedtree/package.json +++ b/examples/benchmarks/bubblebench/sharedtree/package.json @@ -45,7 +45,6 @@ "@fluid-example/example-utils": "workspace:~", "@fluid-experimental/tree": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/datastore-definitions": "workspace:~", diff --git a/examples/data-objects/canvas/package.json b/examples/data-objects/canvas/package.json index 7101b0f1810d..29614f107462 100644 --- a/examples/data-objects/canvas/package.json +++ b/examples/data-objects/canvas/package.json @@ -42,7 +42,6 @@ "dependencies": { "@fluid-example/example-utils": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/ink": "workspace:~", "react": "^17.0.1" diff --git a/examples/data-objects/clicker/package.json b/examples/data-objects/clicker/package.json index 10152050f31d..4ae11f1e022e 100644 --- a/examples/data-objects/clicker/package.json +++ b/examples/data-objects/clicker/package.json @@ -42,7 +42,6 @@ "dependencies": { "@fluid-example/example-utils": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/counter": "workspace:~", "@fluidframework/runtime-definitions": "workspace:~", diff --git a/examples/data-objects/clicker/src/index.tsx b/examples/data-objects/clicker/src/index.tsx index 5756df532c6d..4e0b42606acb 100644 --- a/examples/data-objects/clicker/src/index.tsx +++ b/examples/data-objects/clicker/src/index.tsx @@ -6,8 +6,7 @@ import { ContainerViewRuntimeFactory } from "@fluid-example/example-utils"; import { TaskManager } from "@fluidframework/task-manager"; import { DataObject, DataObjectFactory } from "@fluidframework/aqueduct"; -import { IEvent } from "@fluidframework/common-definitions"; -import { IFluidHandle } from "@fluidframework/core-interfaces"; +import { IEvent, IFluidHandle } from "@fluidframework/core-interfaces"; import { SharedCounter } from "@fluidframework/counter"; import React from "react"; import { ClickerAgent } from "./agent"; diff --git a/examples/data-objects/diceroller/package.json b/examples/data-objects/diceroller/package.json index b6337adefe44..0157357a111e 100644 --- a/examples/data-objects/diceroller/package.json +++ b/examples/data-objects/diceroller/package.json @@ -42,7 +42,6 @@ "dependencies": { "@fluid-example/example-utils": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/map": "workspace:~", "@fluidframework/view-interfaces": "workspace:~", "react": "^17.0.1" diff --git a/examples/data-objects/multiview/constellation-model/package.json b/examples/data-objects/multiview/constellation-model/package.json index 0ec7496b263a..1da9c21bdbfc 100644 --- a/examples/data-objects/multiview/constellation-model/package.json +++ b/examples/data-objects/multiview/constellation-model/package.json @@ -43,7 +43,6 @@ "@fluid-example/multiview-coordinate-interface": "workspace:~", "@fluid-example/multiview-coordinate-model": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/map": "workspace:~" }, diff --git a/examples/data-objects/multiview/coordinate-model/package.json b/examples/data-objects/multiview/coordinate-model/package.json index f24daccd05cb..647b9c1ab5bb 100644 --- a/examples/data-objects/multiview/coordinate-model/package.json +++ b/examples/data-objects/multiview/coordinate-model/package.json @@ -42,7 +42,6 @@ "dependencies": { "@fluid-example/multiview-coordinate-interface": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/map": "workspace:~" }, "devDependencies": { diff --git a/examples/data-objects/table-document/package.json b/examples/data-objects/table-document/package.json index 486fd2b0b0d6..87359a989e73 100644 --- a/examples/data-objects/table-document/package.json +++ b/examples/data-objects/table-document/package.json @@ -54,7 +54,6 @@ "dependencies": { "@fluid-experimental/sequence-deprecated": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/datastore-definitions": "workspace:~", diff --git a/examples/data-objects/table-document/src/document.ts b/examples/data-objects/table-document/src/document.ts index 566e505938a2..4ac3c61639b7 100644 --- a/examples/data-objects/table-document/src/document.ts +++ b/examples/data-objects/table-document/src/document.ts @@ -4,8 +4,7 @@ */ import { DataObject, DataObjectFactory } from "@fluidframework/aqueduct"; -import { IEvent } from "@fluidframework/common-definitions"; -import { IFluidHandle } from "@fluidframework/core-interfaces"; +import { IEvent, IFluidHandle } from "@fluidframework/core-interfaces"; import { ICombiningOp, ReferencePosition, PropertySet } from "@fluidframework/merge-tree"; import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"; import { IntervalType, SequenceDeltaEvent } from "@fluidframework/sequence"; diff --git a/examples/data-objects/table-view/package.json b/examples/data-objects/table-view/package.json index 2b3aef172ea1..7328a5eabe01 100644 --- a/examples/data-objects/table-view/package.json +++ b/examples/data-objects/table-view/package.json @@ -44,7 +44,6 @@ "@fluid-example/example-utils": "workspace:~", "@fluid-example/table-document": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/matrix": "workspace:~", diff --git a/examples/data-objects/webflow/package.json b/examples/data-objects/webflow/package.json index b66e0e2769b9..2e4c8e29b00b 100644 --- a/examples/data-objects/webflow/package.json +++ b/examples/data-objects/webflow/package.json @@ -76,7 +76,6 @@ "dependencies": { "@fluid-example/example-utils": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/data-object-base": "workspace:~", diff --git a/examples/data-objects/webflow/src/document/index.ts b/examples/data-objects/webflow/src/document/index.ts index c3a2a7ecbbe1..7bf1ec9bead6 100644 --- a/examples/data-objects/webflow/src/document/index.ts +++ b/examples/data-objects/webflow/src/document/index.ts @@ -4,11 +4,11 @@ */ import { assert } from "@fluidframework/common-utils"; +import { IEvent, IFluidHandle } from "@fluidframework/core-interfaces"; import { LazyLoadedDataObject, LazyLoadedDataObjectFactory, } from "@fluidframework/data-object-base"; -import { IFluidHandle } from "@fluidframework/core-interfaces"; import { createDetachedLocalReferencePosition, createInsertSegmentOp, @@ -40,7 +40,6 @@ import { SequenceDeltaEvent, } from "@fluidframework/sequence"; import { ISharedDirectory, SharedDirectory } from "@fluidframework/map"; -import { IEvent } from "@fluidframework/common-definitions"; import { clamp, emptyArray, randomId, TagName, TokenList } from "../util/index.js"; import { IHTMLAttributes } from "../util/attr.js"; import { documentType } from "../package.js"; diff --git a/examples/external-data/package.json b/examples/external-data/package.json index 5920f75bab5f..6a6ca71b089c 100644 --- a/examples/external-data/package.json +++ b/examples/external-data/package.json @@ -53,7 +53,6 @@ "@fluid-experimental/react-inputs": "workspace:~", "@fluidframework/aqueduct": "workspace:~", "@fluidframework/cell": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-loader": "workspace:~", diff --git a/examples/external-data/src/mock-external-data-service/externalDataSource.ts b/examples/external-data/src/mock-external-data-service/externalDataSource.ts index c33f3e15277b..7862aaa4eef6 100644 --- a/examples/external-data/src/mock-external-data-service/externalDataSource.ts +++ b/examples/external-data/src/mock-external-data-service/externalDataSource.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -import type { IEvent } from "@fluidframework/common-definitions"; +import type { IEvent } from "@fluidframework/core-interfaces"; import { TypedEventEmitter } from "@fluidframework/common-utils"; import { Response } from "node-fetch"; import { ITaskListData, ITaskData } from "../model-interface"; diff --git a/examples/external-data/src/model-interface/index.ts b/examples/external-data/src/model-interface/index.ts index 2d9053ef99a7..3ed61f60ae21 100644 --- a/examples/external-data/src/model-interface/index.ts +++ b/examples/external-data/src/model-interface/index.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -import type { IEvent, IEventProvider } from "@fluidframework/common-definitions"; +import type { IEvent, IEventProvider } from "@fluidframework/core-interfaces"; import { IResolvedUrl } from "@fluidframework/driver-definitions"; import { SharedString } from "@fluidframework/sequence"; diff --git a/examples/utils/example-utils/package.json b/examples/utils/example-utils/package.json index e8827e099caf..50a01109991a 100644 --- a/examples/utils/example-utils/package.json +++ b/examples/utils/example-utils/package.json @@ -34,7 +34,6 @@ "dependencies": { "@fluid-experimental/pact-map": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-loader": "workspace:~", diff --git a/examples/utils/example-utils/src/migrationInterfaces/migratableModel.ts b/examples/utils/example-utils/src/migrationInterfaces/migratableModel.ts index d97df02db58c..3bc8b74649d4 100644 --- a/examples/utils/example-utils/src/migrationInterfaces/migratableModel.ts +++ b/examples/utils/example-utils/src/migrationInterfaces/migratableModel.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -import type { IEvent, IEventProvider } from "@fluidframework/common-definitions"; +import type { IEvent, IEventProvider } from "@fluidframework/core-interfaces"; import type { IMigrationTool } from "./migrationTool"; export interface IVersionedModel { diff --git a/examples/utils/example-utils/src/migrationInterfaces/migrationTool.ts b/examples/utils/example-utils/src/migrationInterfaces/migrationTool.ts index 5007d69bd84b..96d508e85cef 100644 --- a/examples/utils/example-utils/src/migrationInterfaces/migrationTool.ts +++ b/examples/utils/example-utils/src/migrationInterfaces/migrationTool.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -import type { IEvent, IEventProvider } from "@fluidframework/common-definitions"; +import type { IEvent, IEventProvider } from "@fluidframework/core-interfaces"; /** * The collaboration session may be in one of four states: diff --git a/examples/utils/example-utils/src/migrationInterfaces/migrator.ts b/examples/utils/example-utils/src/migrationInterfaces/migrator.ts index aaf69d05d264..951bf9ce9675 100644 --- a/examples/utils/example-utils/src/migrationInterfaces/migrator.ts +++ b/examples/utils/example-utils/src/migrationInterfaces/migrator.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -import type { IEvent, IEventProvider } from "@fluidframework/common-definitions"; +import type { IEvent, IEventProvider } from "@fluidframework/core-interfaces"; import type { IMigratableModel, MigrationState } from "../migrationInterfaces"; diff --git a/examples/utils/example-utils/src/migrationInterfaces/sameContainerMigratableModel.ts b/examples/utils/example-utils/src/migrationInterfaces/sameContainerMigratableModel.ts index aca0973c3933..ef68051d368a 100644 --- a/examples/utils/example-utils/src/migrationInterfaces/sameContainerMigratableModel.ts +++ b/examples/utils/example-utils/src/migrationInterfaces/sameContainerMigratableModel.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -import type { IEvent, IEventProvider } from "@fluidframework/common-definitions"; +import type { IEvent, IEventProvider } from "@fluidframework/core-interfaces"; import type { IContainer } from "@fluidframework/container-definitions"; import type { IImportExportModel, IVersionedModel } from "./migratableModel"; import type { ISameContainerMigrationTool } from "./sameContainerMigrationTool"; diff --git a/examples/utils/example-utils/src/migrationInterfaces/sameContainerMigrationTool.ts b/examples/utils/example-utils/src/migrationInterfaces/sameContainerMigrationTool.ts index 3a41082a8dc9..ed94a0a3cc37 100644 --- a/examples/utils/example-utils/src/migrationInterfaces/sameContainerMigrationTool.ts +++ b/examples/utils/example-utils/src/migrationInterfaces/sameContainerMigrationTool.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -import type { IEvent, IEventProvider } from "@fluidframework/common-definitions"; +import type { IEvent, IEventProvider } from "@fluidframework/core-interfaces"; import type { IContainer } from "@fluidframework/container-definitions"; /** diff --git a/examples/utils/example-utils/src/migrationInterfaces/sameContainerMigrator.ts b/examples/utils/example-utils/src/migrationInterfaces/sameContainerMigrator.ts index 22e7a20de704..fcfebb9d0ec3 100644 --- a/examples/utils/example-utils/src/migrationInterfaces/sameContainerMigrator.ts +++ b/examples/utils/example-utils/src/migrationInterfaces/sameContainerMigrator.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -import type { IEvent, IEventProvider } from "@fluidframework/common-definitions"; +import type { IEvent, IEventProvider } from "@fluidframework/core-interfaces"; import type { ISameContainerMigratableModel, diff --git a/examples/version-migration/live-schema-upgrade/package.json b/examples/version-migration/live-schema-upgrade/package.json index 45604858b59c..d9d2418d72b8 100644 --- a/examples/version-migration/live-schema-upgrade/package.json +++ b/examples/version-migration/live-schema-upgrade/package.json @@ -38,7 +38,6 @@ "dependencies": { "@fluid-example/example-utils": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-loader": "workspace:~", diff --git a/examples/version-migration/same-container/package.json b/examples/version-migration/same-container/package.json index 58db76029977..680e14d8fe51 100644 --- a/examples/version-migration/same-container/package.json +++ b/examples/version-migration/same-container/package.json @@ -42,7 +42,6 @@ "@fluid-experimental/react-inputs": "workspace:~", "@fluidframework/aqueduct": "workspace:~", "@fluidframework/cell": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-loader": "workspace:~", diff --git a/examples/version-migration/same-container/src/modelInterfaces.ts b/examples/version-migration/same-container/src/modelInterfaces.ts index 0070dbc3cff9..9ffde8ee5303 100644 --- a/examples/version-migration/same-container/src/modelInterfaces.ts +++ b/examples/version-migration/same-container/src/modelInterfaces.ts @@ -8,7 +8,7 @@ import type { ISameContainerMigratableModel, ISameContainerMigratableModelEvents, } from "@fluid-example/example-utils"; -import type { IEventProvider } from "@fluidframework/common-definitions"; +import type { IEventProvider } from "@fluidframework/core-interfaces"; import { SharedString } from "@fluidframework/sequence"; // eslint-disable-next-line @typescript-eslint/no-empty-interface diff --git a/examples/version-migration/schema-upgrade/package.json b/examples/version-migration/schema-upgrade/package.json index 9a1caa73e5ae..41321387ff11 100644 --- a/examples/version-migration/schema-upgrade/package.json +++ b/examples/version-migration/schema-upgrade/package.json @@ -40,7 +40,6 @@ "@fluid-experimental/react-inputs": "workspace:~", "@fluidframework/aqueduct": "workspace:~", "@fluidframework/cell": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-loader": "workspace:~", diff --git a/examples/version-migration/schema-upgrade/src/modelInterfaces.ts b/examples/version-migration/schema-upgrade/src/modelInterfaces.ts index bf4614240b5f..01b717217730 100644 --- a/examples/version-migration/schema-upgrade/src/modelInterfaces.ts +++ b/examples/version-migration/schema-upgrade/src/modelInterfaces.ts @@ -5,7 +5,7 @@ import { EventEmitter } from "events"; import type { IMigratableModel, IMigratableModelEvents } from "@fluid-example/example-utils"; -import type { IEventProvider } from "@fluidframework/common-definitions"; +import type { IEventProvider } from "@fluidframework/core-interfaces"; import { SharedString } from "@fluidframework/sequence"; // eslint-disable-next-line @typescript-eslint/no-empty-interface diff --git a/examples/view-integration/container-views/package.json b/examples/view-integration/container-views/package.json index ede3ef14ffca..4348122c466f 100644 --- a/examples/view-integration/container-views/package.json +++ b/examples/view-integration/container-views/package.json @@ -37,7 +37,6 @@ "dependencies": { "@fluid-example/example-utils": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-loader": "workspace:~", "@fluidframework/container-runtime-definitions": "workspace:~", diff --git a/examples/view-integration/external-views/package.json b/examples/view-integration/external-views/package.json index cce3492b5171..79ea601d77ee 100644 --- a/examples/view-integration/external-views/package.json +++ b/examples/view-integration/external-views/package.json @@ -38,7 +38,6 @@ "dependencies": { "@fluid-example/example-utils": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-runtime-definitions": "workspace:~", "@fluidframework/runtime-utils": "workspace:~", diff --git a/examples/view-integration/view-framework-sampler/package.json b/examples/view-integration/view-framework-sampler/package.json index 2daab685a658..899d103cfc32 100644 --- a/examples/view-integration/view-framework-sampler/package.json +++ b/examples/view-integration/view-framework-sampler/package.json @@ -38,7 +38,6 @@ "dependencies": { "@fluid-example/example-utils": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-runtime-definitions": "workspace:~", "@fluidframework/runtime-utils": "workspace:~", diff --git a/experimental/dds/attributable-map/package.json b/experimental/dds/attributable-map/package.json index 104f7716e534..a76e76bf74c1 100644 --- a/experimental/dds/attributable-map/package.json +++ b/experimental/dds/attributable-map/package.json @@ -62,7 +62,6 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-utils": "workspace:~", "@fluidframework/core-interfaces": "workspace:~", diff --git a/experimental/dds/attributable-map/src/interfaces.ts b/experimental/dds/attributable-map/src/interfaces.ts index 38a5d86cd6a6..2272fc030b33 100644 --- a/experimental/dds/attributable-map/src/interfaces.ts +++ b/experimental/dds/attributable-map/src/interfaces.ts @@ -4,7 +4,7 @@ */ import { ISharedObject, ISharedObjectEvents } from "@fluidframework/shared-object-base"; -import { IEventThisPlaceHolder } from "@fluidframework/common-definitions"; +import { IEventThisPlaceHolder } from "@fluidframework/core-interfaces"; import { AttributionKey } from "@fluidframework/runtime-definitions"; /** * Type of "valueChanged" event parameter. diff --git a/experimental/dds/tree/package.json b/experimental/dds/tree/package.json index 1ab51477997b..5ef9a98cc341 100644 --- a/experimental/dds/tree/package.json +++ b/experimental/dds/tree/package.json @@ -40,7 +40,6 @@ "tsc": "tsc" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/core-interfaces": "workspace:~", diff --git a/experimental/dds/tree/src/Checkout.ts b/experimental/dds/tree/src/Checkout.ts index 7f3beee8d459..6159c6e865b5 100644 --- a/experimental/dds/tree/src/Checkout.ts +++ b/experimental/dds/tree/src/Checkout.ts @@ -5,8 +5,7 @@ import { assert } from '@fluidframework/common-utils'; import { EventEmitterWithErrorHandling, ITelemetryLoggerExt, createChildLogger } from '@fluidframework/telemetry-utils'; -import { IErrorEvent } from '@fluidframework/common-definitions'; -import { IDisposable, ITelemetryProperties } from '@fluidframework/core-interfaces'; +import { IDisposable, IErrorEvent, ITelemetryProperties } from '@fluidframework/core-interfaces'; import { assertWithMessage, fail, RestOrArray, unwrapRestOrArray } from './Common'; import { EditId } from './Identifiers'; import { CachingLogViewer } from './LogViewer'; diff --git a/experimental/dds/tree/src/EditLog.ts b/experimental/dds/tree/src/EditLog.ts index afa16f5a0641..73cfd3e3af3c 100644 --- a/experimental/dds/tree/src/EditLog.ts +++ b/experimental/dds/tree/src/EditLog.ts @@ -5,7 +5,7 @@ import BTree from 'sorted-btree'; import { TypedEventEmitter, assert } from '@fluidframework/common-utils'; -import type { IEvent } from '@fluidframework/common-definitions'; +import type { IEvent } from '@fluidframework/core-interfaces'; import { ITelemetryLoggerExt } from '@fluidframework/telemetry-utils'; import { compareArrays } from '@fluidframework/core-utils'; import { fail } from './Common'; diff --git a/experimental/dds/tree/src/LogViewer.ts b/experimental/dds/tree/src/LogViewer.ts index 5a981914f4a0..0b286b33ee16 100644 --- a/experimental/dds/tree/src/LogViewer.ts +++ b/experimental/dds/tree/src/LogViewer.ts @@ -4,7 +4,7 @@ */ import Denque from 'denque'; -import { IEvent } from '@fluidframework/common-definitions'; +import { IEvent } from '@fluidframework/core-interfaces'; import { assert, TypedEventEmitter } from '@fluidframework/common-utils'; import { fail, noop } from './Common'; import { EditLog, SequencedOrderedEditId } from './EditLog'; diff --git a/experimental/dds/tree/src/Transaction.ts b/experimental/dds/tree/src/Transaction.ts index 559f80734f31..54cd229b94a2 100644 --- a/experimental/dds/tree/src/Transaction.ts +++ b/experimental/dds/tree/src/Transaction.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -import { IErrorEvent } from '@fluidframework/common-definitions'; +import { IErrorEvent } from '@fluidframework/core-interfaces'; import { TypedEventEmitter } from '@fluidframework/common-utils'; import { ChangeInternal, Edit, EditStatus } from './persisted-types'; import { newEditId } from './EditUtilities'; diff --git a/experimental/dds/tree2/package.json b/experimental/dds/tree2/package.json index d8a7ed3117e3..87d06d73e5a7 100644 --- a/experimental/dds/tree2/package.json +++ b/experimental/dds/tree2/package.json @@ -66,7 +66,6 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-runtime": "workspace:~", "@fluidframework/core-interfaces": "workspace:~", diff --git a/experimental/dds/tree2/src/events/events.ts b/experimental/dds/tree2/src/events/events.ts index e40d28a60d8b..a38f771cdd60 100644 --- a/experimental/dds/tree2/src/events/events.ts +++ b/experimental/dds/tree2/src/events/events.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -import type { IEvent } from "@fluidframework/common-definitions"; +import type { IEvent } from "@fluidframework/core-interfaces"; import { assert } from "@fluidframework/common-utils"; import { fail, getOrCreate } from "../util"; @@ -41,7 +41,7 @@ export type Events = { /** * Converts an `Events` type (i.e. the event registry for an {@link ISubscribable}) into a type consumable - * by an IEventProvider from `@fluidframework/common-definitions`. + * by an IEventProvider from `@fluidframework/core-interfaces`. * @param E - the `Events` type to transform * @param Target - an optional `IEvent` type that will be merged into the result along with the transformed `E` * @example diff --git a/experimental/dds/tree2/src/test/shared-tree-core/sharedTreeCore.spec.ts b/experimental/dds/tree2/src/test/shared-tree-core/sharedTreeCore.spec.ts index 83ac10112701..25291b988baf 100644 --- a/experimental/dds/tree2/src/test/shared-tree-core/sharedTreeCore.spec.ts +++ b/experimental/dds/tree2/src/test/shared-tree-core/sharedTreeCore.spec.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ import { strict as assert } from "assert"; -import { IEvent } from "@fluidframework/common-definitions"; +import { IEvent } from "@fluidframework/core-interfaces"; import { IsoBuffer, TypedEventEmitter } from "@fluidframework/common-utils"; import { IChannelAttributes, IChannelStorageService } from "@fluidframework/datastore-definitions"; import { ISummaryTree, SummaryObject, SummaryType } from "@fluidframework/protocol-definitions"; diff --git a/experimental/framework/data-objects/package.json b/experimental/framework/data-objects/package.json index 3977c51621c9..c84f291cca66 100644 --- a/experimental/framework/data-objects/package.json +++ b/experimental/framework/data-objects/package.json @@ -31,8 +31,8 @@ }, "dependencies": { "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", + "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/datastore-definitions": "workspace:~", "@fluidframework/map": "workspace:~", "@fluidframework/runtime-definitions": "workspace:~", diff --git a/experimental/framework/data-objects/src/signaler/signaler.ts b/experimental/framework/data-objects/src/signaler/signaler.ts index 9a9560673aec..9909df5a8439 100644 --- a/experimental/framework/data-objects/src/signaler/signaler.ts +++ b/experimental/framework/data-objects/src/signaler/signaler.ts @@ -5,7 +5,7 @@ import { EventEmitter } from "events"; import { DataObject, DataObjectFactory } from "@fluidframework/aqueduct"; -import { IErrorEvent } from "@fluidframework/common-definitions"; +import { IErrorEvent } from "@fluidframework/core-interfaces"; import { assert, TypedEventEmitter } from "@fluidframework/common-utils"; import { Jsonable } from "@fluidframework/datastore-definitions"; import { IInboundSignalMessage } from "@fluidframework/runtime-definitions"; diff --git a/experimental/framework/last-edited/package.json b/experimental/framework/last-edited/package.json index d1de3365ea22..580cbade3e72 100644 --- a/experimental/framework/last-edited/package.json +++ b/experimental/framework/last-edited/package.json @@ -53,7 +53,6 @@ }, "dependencies": { "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/container-runtime": "workspace:~", "@fluidframework/container-runtime-definitions": "workspace:~", "@fluidframework/core-interfaces": "workspace:~", diff --git a/experimental/framework/react-inputs/package.json b/experimental/framework/react-inputs/package.json index 3022afe91d61..c4881343f3a1 100644 --- a/experimental/framework/react-inputs/package.json +++ b/experimental/framework/react-inputs/package.json @@ -32,8 +32,8 @@ }, "dependencies": { "@fluidframework/cell": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", + "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/merge-tree": "workspace:~", "@fluidframework/sequence": "workspace:~", "react": "^17.0.1" diff --git a/experimental/framework/react-inputs/src/SharedStringHelper.ts b/experimental/framework/react-inputs/src/SharedStringHelper.ts index 3f329a27d6ad..33194e3a2bbf 100644 --- a/experimental/framework/react-inputs/src/SharedStringHelper.ts +++ b/experimental/framework/react-inputs/src/SharedStringHelper.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -import { IEvent } from "@fluidframework/common-definitions"; +import { IEvent } from "@fluidframework/core-interfaces"; import { TypedEventEmitter } from "@fluidframework/common-utils"; import { MergeTreeDeltaType } from "@fluidframework/merge-tree"; import { SequenceDeltaEvent, SharedString } from "@fluidframework/sequence"; diff --git a/packages/common/container-definitions/package.json b/packages/common/container-definitions/package.json index cc471cf26247..f43c91465f20 100644 --- a/packages/common/container-definitions/package.json +++ b/packages/common/container-definitions/package.json @@ -39,7 +39,6 @@ "typetests:prepare": "flub typetests --dir . --reset --previous --normalize" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/driver-definitions": "workspace:~", "@fluidframework/protocol-definitions": "^1.1.0", diff --git a/packages/common/container-definitions/src/deltas.ts b/packages/common/container-definitions/src/deltas.ts index fc1212c2d15d..519b4978cdbf 100644 --- a/packages/common/container-definitions/src/deltas.ts +++ b/packages/common/container-definitions/src/deltas.ts @@ -3,8 +3,7 @@ * Licensed under the MIT License. */ -import { IEventProvider, IEvent, IErrorEvent } from "@fluidframework/common-definitions"; -import { IDisposable } from "@fluidframework/core-interfaces"; +import { IDisposable, IEventProvider, IEvent, IErrorEvent } from "@fluidframework/core-interfaces"; import { IAnyDriverError } from "@fluidframework/driver-definitions"; import { IClientConfiguration, diff --git a/packages/common/container-definitions/src/loader.ts b/packages/common/container-definitions/src/loader.ts index 1b1a413f41c3..6552288189c6 100644 --- a/packages/common/container-definitions/src/loader.ts +++ b/packages/common/container-definitions/src/loader.ts @@ -3,7 +3,14 @@ * Licensed under the MIT License. */ -import { IRequest, IResponse, IFluidRouter, FluidObject } from "@fluidframework/core-interfaces"; +import { + IRequest, + IResponse, + IFluidRouter, + FluidObject, + IEvent, + IEventProvider, +} from "@fluidframework/core-interfaces"; import { IClientDetails, IDocumentMessage, @@ -13,7 +20,6 @@ import { ISnapshotTree, } from "@fluidframework/protocol-definitions"; import { IResolvedUrl } from "@fluidframework/driver-definitions"; -import { IEvent, IEventProvider } from "@fluidframework/common-definitions"; import { IAudience } from "./audience"; import { IDeltaManager, ReadOnlyInfo } from "./deltas"; import { ICriticalContainerError, ContainerWarning } from "./error"; diff --git a/packages/common/core-interfaces/src/events.ts b/packages/common/core-interfaces/src/events.ts new file mode 100644 index 000000000000..e7e065a674f9 --- /dev/null +++ b/packages/common/core-interfaces/src/events.ts @@ -0,0 +1,430 @@ +/*! + * Copyright (c) Microsoft Corporation and contributors. All rights reserved. + * Licensed under the MIT License. + */ + +/** + * Base interface for event emitters. + */ +export interface IEvent { + /** + * Base event emitter signature. + * + * @remarks The event emitter polyfill and the node event emitter have different event types: + * `string | symbol` vs. `string | number`. + * + * So for our typing we'll contrain to string, that way we work with both. + * + * @eventProperty + */ + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (event: string, listener: (...args: any[]) => void); +} + +/** + * Base interface for error event emitters. + */ +export interface IErrorEvent extends IEvent { + /** + * Base error event emitter signature. + * + * @eventProperty + */ + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (event: "error", listener: (message: any) => void); +} + +/** + * Base interface for event providers. + */ +export interface IEventProvider { + /** + * Registers a callback to be invoked when the corresponding event is triggered. + */ + readonly on: IEventTransformer; + + /** + * Registers a callback to be invoked the first time (after registration) the corresponding event is triggered. + */ + readonly once: IEventTransformer; + + /** + * Removes the corresponding event if it has been registered. + */ + readonly off: IEventTransformer; +} + +/** + * Allows an interface to extend interfaces that already extend an {@link IEventProvider}. + * + * @example + * ``` typescript + * interface AEvents extends IEvent{ + * (event: "a-event",listener: (a: number)=>void); + * } + * interface A extends IEventProvider{ + * a: object; + * } + * + * interface BEvents extends IEvent{ + * (event: "b-event",listener: (b: string)=>void); + * } + * interface B extends ExtendEventProvider{ + * b: boolean; + * }; + * ``` + * interface B will now extend interface A and its events + * + */ +export type ExtendEventProvider< + TBaseEvent extends IEvent, + TBase extends IEventProvider, + TEvent extends TBaseEvent, +> = Omit, "once">, "off"> & + IEventProvider & + IEventProvider; + +// These types handle replacing IEventThisPlaceHolder with `this`, so we can +// support polymorphic `this`. For instance if an event wanted to be: +// (event: "some-event", listener:(target: this)=>void) +// +// it should be written as +// (event: "some-event", listener:(target: IEventThisPlaceHolder)=>void) +// +// and IEventThisPlaceHolder will be replaced with this. +// This is all consumers of these types need to know. + +/** + * The placeholder type that should be used instead of `this` in events. + */ +// eslint-disable-next-line @typescript-eslint/consistent-type-definitions +export type IEventThisPlaceHolder = { thisPlaceHolder: "thisPlaceHolder" }; + +/** + * Does the type replacement by changing types of {@link IEventThisPlaceHolder} to `TThis` + */ +// eslint-disable-next-line @typescript-eslint/no-explicit-any +export type ReplaceIEventThisPlaceHolder = L extends any[] + ? { [K in keyof L]: L[K] extends IEventThisPlaceHolder ? TThis : L[K] } + : L; + +/** + * Transforms the event overload by replacing {@link IEventThisPlaceHolder} with `TThis` in the event listener + * arguments and having the overload return `TTHis` as well + */ +// eslint-disable-next-line @typescript-eslint/no-explicit-any +export type TransformedEvent = ( + event: E, + listener: (...args: ReplaceIEventThisPlaceHolder) => void, +) => TThis; + +/** + * This type is a conditional type for transforming all the overloads provided in `TEvent`. + * + * @remarks + * Due to limitations of the TypeScript typing system, we need to handle each number of overload individually. + * It currently supports the max of 15 event overloads which is more than we use anywhere. + * At more than 15 overloads we start to hit {@link https://github.com/microsoft/TypeScript/issues/37209 | TS2589}. + * If we need to move beyond 15 we should evaluate using a mapped type pattern like `{"event":(listenerArgs)=>void}` + */ +export type IEventTransformer = TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void); + (event: infer E1, listener: (...args: infer A1) => void); + (event: infer E2, listener: (...args: infer A2) => void); + (event: infer E3, listener: (...args: infer A3) => void); + (event: infer E4, listener: (...args: infer A4) => void); + (event: infer E5, listener: (...args: infer A5) => void); + (event: infer E6, listener: (...args: infer A6) => void); + (event: infer E7, listener: (...args: infer A7) => void); + (event: infer E8, listener: (...args: infer A8) => void); + (event: infer E9, listener: (...args: infer A9) => void); + (event: infer E10, listener: (...args: infer A10) => void); + (event: infer E11, listener: (...args: infer A11) => void); + (event: infer E12, listener: (...args: infer A12) => void); + (event: infer E13, listener: (...args: infer A13) => void); + (event: infer E14, listener: (...args: infer A14) => void); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (event: string, listener: (...args: any[]) => void); +} + ? TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent + : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void); + (event: infer E1, listener: (...args: infer A1) => void); + (event: infer E2, listener: (...args: infer A2) => void); + (event: infer E3, listener: (...args: infer A3) => void); + (event: infer E4, listener: (...args: infer A4) => void); + (event: infer E5, listener: (...args: infer A5) => void); + (event: infer E6, listener: (...args: infer A6) => void); + (event: infer E7, listener: (...args: infer A7) => void); + (event: infer E8, listener: (...args: infer A8) => void); + (event: infer E9, listener: (...args: infer A9) => void); + (event: infer E10, listener: (...args: infer A10) => void); + (event: infer E11, listener: (...args: infer A11) => void); + (event: infer E12, listener: (...args: infer A12) => void); + (event: infer E13, listener: (...args: infer A13) => void); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (event: string, listener: (...args: any[]) => void); + } + ? TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent + : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void); + (event: infer E1, listener: (...args: infer A1) => void); + (event: infer E2, listener: (...args: infer A2) => void); + (event: infer E3, listener: (...args: infer A3) => void); + (event: infer E4, listener: (...args: infer A4) => void); + (event: infer E5, listener: (...args: infer A5) => void); + (event: infer E6, listener: (...args: infer A6) => void); + (event: infer E7, listener: (...args: infer A7) => void); + (event: infer E8, listener: (...args: infer A8) => void); + (event: infer E9, listener: (...args: infer A9) => void); + (event: infer E10, listener: (...args: infer A10) => void); + (event: infer E11, listener: (...args: infer A11) => void); + (event: infer E12, listener: (...args: infer A12) => void); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (event: string, listener: (...args: any[]) => void); + } + ? TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent + : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void); + (event: infer E1, listener: (...args: infer A1) => void); + (event: infer E2, listener: (...args: infer A2) => void); + (event: infer E3, listener: (...args: infer A3) => void); + (event: infer E4, listener: (...args: infer A4) => void); + (event: infer E5, listener: (...args: infer A5) => void); + (event: infer E6, listener: (...args: infer A6) => void); + (event: infer E7, listener: (...args: infer A7) => void); + (event: infer E8, listener: (...args: infer A8) => void); + (event: infer E9, listener: (...args: infer A9) => void); + (event: infer E10, listener: (...args: infer A10) => void); + (event: infer E11, listener: (...args: infer A11) => void); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (event: string, listener: (...args: any[]) => void); + } + ? TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent + : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void); + (event: infer E1, listener: (...args: infer A1) => void); + (event: infer E2, listener: (...args: infer A2) => void); + (event: infer E3, listener: (...args: infer A3) => void); + (event: infer E4, listener: (...args: infer A4) => void); + (event: infer E5, listener: (...args: infer A5) => void); + (event: infer E6, listener: (...args: infer A6) => void); + (event: infer E7, listener: (...args: infer A7) => void); + (event: infer E8, listener: (...args: infer A8) => void); + (event: infer E9, listener: (...args: infer A9) => void); + (event: infer E10, listener: (...args: infer A10) => void); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (event: string, listener: (...args: any[]) => void); + } + ? TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent + : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void); + (event: infer E1, listener: (...args: infer A1) => void); + (event: infer E2, listener: (...args: infer A2) => void); + (event: infer E3, listener: (...args: infer A3) => void); + (event: infer E4, listener: (...args: infer A4) => void); + (event: infer E5, listener: (...args: infer A5) => void); + (event: infer E6, listener: (...args: infer A6) => void); + (event: infer E7, listener: (...args: infer A7) => void); + (event: infer E8, listener: (...args: infer A8) => void); + (event: infer E9, listener: (...args: infer A9) => void); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (event: string, listener: (...args: any[]) => void); + } + ? TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent + : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void); + (event: infer E1, listener: (...args: infer A1) => void); + (event: infer E2, listener: (...args: infer A2) => void); + (event: infer E3, listener: (...args: infer A3) => void); + (event: infer E4, listener: (...args: infer A4) => void); + (event: infer E5, listener: (...args: infer A5) => void); + (event: infer E6, listener: (...args: infer A6) => void); + (event: infer E7, listener: (...args: infer A7) => void); + (event: infer E8, listener: (...args: infer A8) => void); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (event: string, listener: (...args: any[]) => void); + } + ? TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent + : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void); + (event: infer E1, listener: (...args: infer A1) => void); + (event: infer E2, listener: (...args: infer A2) => void); + (event: infer E3, listener: (...args: infer A3) => void); + (event: infer E4, listener: (...args: infer A4) => void); + (event: infer E5, listener: (...args: infer A5) => void); + (event: infer E6, listener: (...args: infer A6) => void); + (event: infer E7, listener: (...args: infer A7) => void); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (event: string, listener: (...args: any[]) => void); + } + ? TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent + : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void); + (event: infer E1, listener: (...args: infer A1) => void); + (event: infer E2, listener: (...args: infer A2) => void); + (event: infer E3, listener: (...args: infer A3) => void); + (event: infer E4, listener: (...args: infer A4) => void); + (event: infer E5, listener: (...args: infer A5) => void); + (event: infer E6, listener: (...args: infer A6) => void); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (event: string, listener: (...args: any[]) => void); + } + ? TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent + : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void); + (event: infer E1, listener: (...args: infer A1) => void); + (event: infer E2, listener: (...args: infer A2) => void); + (event: infer E3, listener: (...args: infer A3) => void); + (event: infer E4, listener: (...args: infer A4) => void); + (event: infer E5, listener: (...args: infer A5) => void); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (event: string, listener: (...args: any[]) => void); + } + ? TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent + : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void); + (event: infer E1, listener: (...args: infer A1) => void); + (event: infer E2, listener: (...args: infer A2) => void); + (event: infer E3, listener: (...args: infer A3) => void); + (event: infer E4, listener: (...args: infer A4) => void); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (event: string, listener: (...args: any[]) => void); + } + ? TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent + : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void); + (event: infer E1, listener: (...args: infer A1) => void); + (event: infer E2, listener: (...args: infer A2) => void); + (event: infer E3, listener: (...args: infer A3) => void); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (event: string, listener: (...args: any[]) => void); + } + ? TransformedEvent & + TransformedEvent & + TransformedEvent & + TransformedEvent + : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void); + (event: infer E1, listener: (...args: infer A1) => void); + (event: infer E2, listener: (...args: infer A2) => void); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (event: string, listener: (...args: any[]) => void); + } + ? TransformedEvent & + TransformedEvent & + TransformedEvent + : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void); + (event: infer E1, listener: (...args: infer A1) => void); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (event: string, listener: (...args: any[]) => void); + } + ? TransformedEvent & TransformedEvent + : TEvent extends { + (event: infer E0, listener: (...args: infer A0) => void); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (event: string, listener: (...args: any[]) => void); + } + ? TransformedEvent + : // eslint-disable-next-line @typescript-eslint/no-explicit-any + TransformedEvent; diff --git a/packages/common/core-interfaces/src/index.ts b/packages/common/core-interfaces/src/index.ts index f31e3fa0df35..bc6694a8988e 100644 --- a/packages/common/core-interfaces/src/index.ts +++ b/packages/common/core-interfaces/src/index.ts @@ -3,6 +3,17 @@ * Licensed under the MIT License. */ +export type { + ExtendEventProvider, + IErrorEvent, + IEvent, + IEventProvider, + IEventThisPlaceHolder, + IEventTransformer, + ReplaceIEventThisPlaceHolder, + TransformedEvent, +} from "./events"; + export { IFluidLoadable, IProvideFluidLoadable, diff --git a/packages/common/driver-definitions/package.json b/packages/common/driver-definitions/package.json index 696bd7ab07c9..373ec4c73dfa 100644 --- a/packages/common/driver-definitions/package.json +++ b/packages/common/driver-definitions/package.json @@ -37,7 +37,6 @@ "typetests:prepare": "flub typetests --dir . --reset --previous --normalize" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/protocol-definitions": "^1.1.0" }, diff --git a/packages/common/driver-definitions/src/storage.ts b/packages/common/driver-definitions/src/storage.ts index 05f15bfcbb4c..2dce6950910e 100644 --- a/packages/common/driver-definitions/src/storage.ts +++ b/packages/common/driver-definitions/src/storage.ts @@ -3,8 +3,12 @@ * Licensed under the MIT License. */ -import { IEventProvider, IErrorEvent } from "@fluidframework/common-definitions"; -import { IDisposable, ITelemetryBaseLogger } from "@fluidframework/core-interfaces"; +import { + IDisposable, + IEventProvider, + IErrorEvent, + ITelemetryBaseLogger, +} from "@fluidframework/core-interfaces"; import { ConnectionMode, IClient, diff --git a/packages/dds/map/package.json b/packages/dds/map/package.json index 8e7daa67c1bd..82caaf4db0f0 100644 --- a/packages/dds/map/package.json +++ b/packages/dds/map/package.json @@ -64,7 +64,6 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-utils": "workspace:~", "@fluidframework/core-interfaces": "workspace:~", diff --git a/packages/dds/map/src/interfaces.ts b/packages/dds/map/src/interfaces.ts index 590a04f8e253..70f82c14c4ff 100644 --- a/packages/dds/map/src/interfaces.ts +++ b/packages/dds/map/src/interfaces.ts @@ -4,8 +4,12 @@ */ import { ISharedObject, ISharedObjectEvents } from "@fluidframework/shared-object-base"; -import { IEvent, IEventProvider, IEventThisPlaceHolder } from "@fluidframework/common-definitions"; -import { IDisposable } from "@fluidframework/core-interfaces"; +import { + IDisposable, + IEvent, + IEventProvider, + IEventThisPlaceHolder, +} from "@fluidframework/core-interfaces"; /** * Type of "valueChanged" event parameter. diff --git a/packages/dds/matrix/package.json b/packages/dds/matrix/package.json index 80913d13423c..6f3740fb0c20 100644 --- a/packages/dds/matrix/package.json +++ b/packages/dds/matrix/package.json @@ -62,7 +62,6 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/datastore-definitions": "workspace:~", diff --git a/packages/dds/merge-tree/package.json b/packages/dds/merge-tree/package.json index 996eaa802f8e..36bdf408a360 100644 --- a/packages/dds/merge-tree/package.json +++ b/packages/dds/merge-tree/package.json @@ -66,7 +66,6 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-utils": "workspace:~", diff --git a/packages/dds/merge-tree/src/client.ts b/packages/dds/merge-tree/src/client.ts index 18a1ce3392e4..52014e92f1d6 100644 --- a/packages/dds/merge-tree/src/client.ts +++ b/packages/dds/merge-tree/src/client.ts @@ -5,7 +5,7 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ -import { IFluidHandle } from "@fluidframework/core-interfaces"; +import { IFluidHandle, type IEventThisPlaceHolder } from "@fluidframework/core-interfaces"; import { IFluidSerializer } from "@fluidframework/shared-object-base"; import { ISequencedDocumentMessage, MessageType } from "@fluidframework/protocol-definitions"; import { @@ -13,7 +13,6 @@ import { IChannelStorageService, } from "@fluidframework/datastore-definitions"; import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions"; -import type { IEventThisPlaceHolder } from "@fluidframework/common-definitions"; import { assert, TypedEventEmitter, unreachableCase } from "@fluidframework/common-utils"; import { ITelemetryLoggerExt, LoggingError } from "@fluidframework/telemetry-utils"; import { UsageError } from "@fluidframework/container-utils"; diff --git a/packages/dds/pact-map/package.json b/packages/dds/pact-map/package.json index 2e15096b8ac8..edf1d07aa42b 100644 --- a/packages/dds/pact-map/package.json +++ b/packages/dds/pact-map/package.json @@ -59,7 +59,6 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/datastore-definitions": "workspace:~", diff --git a/packages/dds/sequence/package.json b/packages/dds/sequence/package.json index f9d7384f3142..e0d2f213a623 100644 --- a/packages/dds/sequence/package.json +++ b/packages/dds/sequence/package.json @@ -70,7 +70,6 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-utils": "workspace:~", "@fluidframework/core-interfaces": "workspace:~", diff --git a/packages/dds/sequence/src/defaultMapInterfaces.ts b/packages/dds/sequence/src/defaultMapInterfaces.ts index 1995cb2c422b..8c4b22c1592c 100644 --- a/packages/dds/sequence/src/defaultMapInterfaces.ts +++ b/packages/dds/sequence/src/defaultMapInterfaces.ts @@ -5,7 +5,7 @@ import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"; import { ISharedObjectEvents } from "@fluidframework/shared-object-base"; -import { IEventThisPlaceHolder } from "@fluidframework/common-definitions"; +import { IEventThisPlaceHolder } from "@fluidframework/core-interfaces"; /** * Type of "valueChanged" event parameter. diff --git a/packages/dds/sequence/src/intervalCollection.ts b/packages/dds/sequence/src/intervalCollection.ts index 172de7486278..850cba078a2a 100644 --- a/packages/dds/sequence/src/intervalCollection.ts +++ b/packages/dds/sequence/src/intervalCollection.ts @@ -6,7 +6,7 @@ /* eslint-disable no-bitwise */ import { assert, TypedEventEmitter } from "@fluidframework/common-utils"; -import { IEvent } from "@fluidframework/common-definitions"; +import { IEvent } from "@fluidframework/core-interfaces"; import { UsageError } from "@fluidframework/container-utils"; import { addProperties, diff --git a/packages/dds/sequence/src/sequence.ts b/packages/dds/sequence/src/sequence.ts index b8def7e514af..41578925de8a 100644 --- a/packages/dds/sequence/src/sequence.ts +++ b/packages/dds/sequence/src/sequence.ts @@ -46,7 +46,7 @@ import { ISharedObjectEvents, SummarySerializer, } from "@fluidframework/shared-object-base"; -import { IEventThisPlaceHolder } from "@fluidframework/common-definitions"; +import { IEventThisPlaceHolder } from "@fluidframework/core-interfaces"; import { ISummaryTreeWithStats, ITelemetryContext } from "@fluidframework/runtime-definitions"; import { DefaultMap, IMapOperation } from "./defaultMap"; import { IMapMessageLocalMetadata, IValueChanged } from "./defaultMapInterfaces"; diff --git a/packages/dds/shared-object-base/package.json b/packages/dds/shared-object-base/package.json index 31faddb9194e..5b621bb15cb4 100644 --- a/packages/dds/shared-object-base/package.json +++ b/packages/dds/shared-object-base/package.json @@ -62,7 +62,6 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-runtime": "workspace:~", diff --git a/packages/dds/shared-object-base/src/sharedObject.ts b/packages/dds/shared-object-base/src/sharedObject.ts index 1cf9748780a1..e54232c9e2e2 100644 --- a/packages/dds/shared-object-base/src/sharedObject.ts +++ b/packages/dds/shared-object-base/src/sharedObject.ts @@ -4,7 +4,7 @@ */ import { v4 as uuid } from "uuid"; -import { ITelemetryProperties } from "@fluidframework/common-definitions"; +import { IFluidHandle, ITelemetryProperties } from "@fluidframework/core-interfaces"; import { ITelemetryLoggerExt, createChildLogger, @@ -16,7 +16,6 @@ import { } from "@fluidframework/telemetry-utils"; import { assert, EventEmitterEventType } from "@fluidframework/common-utils"; import { AttachState } from "@fluidframework/container-definitions"; -import { IFluidHandle } from "@fluidframework/core-interfaces"; import { IChannelAttributes, IFluidDataStoreRuntime, diff --git a/packages/dds/shared-object-base/src/types.ts b/packages/dds/shared-object-base/src/types.ts index 3470befd4ed0..9d6cd2c84ac3 100644 --- a/packages/dds/shared-object-base/src/types.ts +++ b/packages/dds/shared-object-base/src/types.ts @@ -7,7 +7,7 @@ import { IErrorEvent, IEventProvider, IEventThisPlaceHolder, -} from "@fluidframework/common-definitions"; +} from "@fluidframework/core-interfaces"; import { IChannel } from "@fluidframework/datastore-definitions"; import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"; import { IGarbageCollectionData } from "@fluidframework/runtime-definitions"; diff --git a/packages/dds/task-manager/package.json b/packages/dds/task-manager/package.json index 26746c6baf35..e3ac2fe5fe03 100644 --- a/packages/dds/task-manager/package.json +++ b/packages/dds/task-manager/package.json @@ -61,7 +61,6 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-runtime-definitions": "workspace:~", diff --git a/packages/drivers/odsp-driver/package.json b/packages/drivers/odsp-driver/package.json index 1a3ee29df4aa..e4c5993c1ec8 100644 --- a/packages/drivers/odsp-driver/package.json +++ b/packages/drivers/odsp-driver/package.json @@ -61,7 +61,6 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/core-utils": "workspace:~", diff --git a/packages/drivers/odsp-driver/src/odspDocumentDeltaConnection.ts b/packages/drivers/odsp-driver/src/odspDocumentDeltaConnection.ts index f0ee887564cc..aac982a0e330 100644 --- a/packages/drivers/odsp-driver/src/odspDocumentDeltaConnection.ts +++ b/packages/drivers/odsp-driver/src/odspDocumentDeltaConnection.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -import { IEvent } from "@fluidframework/common-definitions"; +import { IEvent } from "@fluidframework/core-interfaces"; import { ITelemetryLoggerExt, IFluidErrorBase, diff --git a/packages/drivers/replay-driver/package.json b/packages/drivers/replay-driver/package.json index 257aef9a30f1..5f7520256fe0 100644 --- a/packages/drivers/replay-driver/package.json +++ b/packages/drivers/replay-driver/package.json @@ -33,7 +33,6 @@ "typetests:prepare": "flub typetests --dir . --reset --previous --normalize" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/driver-definitions": "workspace:~", diff --git a/packages/drivers/routerlicious-driver/package.json b/packages/drivers/routerlicious-driver/package.json index c12abe62f063..59ed332314a9 100644 --- a/packages/drivers/routerlicious-driver/package.json +++ b/packages/drivers/routerlicious-driver/package.json @@ -61,7 +61,6 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/driver-base": "workspace:~", diff --git a/packages/framework/agent-scheduler/package.json b/packages/framework/agent-scheduler/package.json index 6a85125f5946..e4e342203239 100644 --- a/packages/framework/agent-scheduler/package.json +++ b/packages/framework/agent-scheduler/package.json @@ -52,7 +52,6 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-utils": "workspace:~", diff --git a/packages/framework/agent-scheduler/src/agent.ts b/packages/framework/agent-scheduler/src/agent.ts index 36200e2568af..6a24b28b5fd4 100644 --- a/packages/framework/agent-scheduler/src/agent.ts +++ b/packages/framework/agent-scheduler/src/agent.ts @@ -3,8 +3,7 @@ * Licensed under the MIT License. */ -import { IEvent, IEventProvider } from "@fluidframework/common-definitions"; -import { IFluidLoadable } from "@fluidframework/core-interfaces"; +import { IEvent, IEventProvider, IFluidLoadable } from "@fluidframework/core-interfaces"; export const IAgentScheduler: keyof IProvideAgentScheduler = "IAgentScheduler"; diff --git a/packages/framework/agent-scheduler/src/taskSubscription.ts b/packages/framework/agent-scheduler/src/taskSubscription.ts index 1cf1c2bf59b4..5237a60de3b4 100644 --- a/packages/framework/agent-scheduler/src/taskSubscription.ts +++ b/packages/framework/agent-scheduler/src/taskSubscription.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -import { IEvent } from "@fluidframework/common-definitions"; +import { IEvent } from "@fluidframework/core-interfaces"; import { TypedEventEmitter } from "@fluidframework/common-utils"; import { IAgentScheduler } from "./agent"; diff --git a/packages/framework/aqueduct/package.json b/packages/framework/aqueduct/package.json index 1e89537ff4b9..55c00ad35f28 100644 --- a/packages/framework/aqueduct/package.json +++ b/packages/framework/aqueduct/package.json @@ -65,7 +65,6 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-runtime": "workspace:~", diff --git a/packages/framework/aqueduct/src/data-objects/pureDataObject.ts b/packages/framework/aqueduct/src/data-objects/pureDataObject.ts index 298614f4fa1e..eba198c2c542 100644 --- a/packages/framework/aqueduct/src/data-objects/pureDataObject.ts +++ b/packages/framework/aqueduct/src/data-objects/pureDataObject.ts @@ -4,9 +4,10 @@ */ import type { EventEmitter } from "events"; -import { IEvent, IEventProvider } from "@fluidframework/common-definitions"; import { assert, EventForwarder } from "@fluidframework/common-utils"; import { + IEvent, + IEventProvider, IFluidHandle, IFluidLoadable, IFluidRouter, diff --git a/packages/framework/aqueduct/src/data-objects/types.ts b/packages/framework/aqueduct/src/data-objects/types.ts index 96ec167e0a22..b37952d58481 100644 --- a/packages/framework/aqueduct/src/data-objects/types.ts +++ b/packages/framework/aqueduct/src/data-objects/types.ts @@ -3,11 +3,10 @@ * Licensed under the MIT License. */ -import { FluidObject } from "@fluidframework/core-interfaces"; +import { IEvent, FluidObject } from "@fluidframework/core-interfaces"; import { AsyncFluidObjectProvider } from "@fluidframework/synthesize"; import { IFluidDataStoreContext } from "@fluidframework/runtime-definitions"; import { IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions"; -import { IEvent } from "@fluidframework/common-definitions"; /** * This type is used as the base generic input to DataObject and PureDataObject. diff --git a/packages/framework/client-logger/app-insights-logger/package.json b/packages/framework/client-logger/app-insights-logger/package.json index 849acaa9f712..227d1b40c3e4 100644 --- a/packages/framework/client-logger/app-insights-logger/package.json +++ b/packages/framework/client-logger/app-insights-logger/package.json @@ -37,7 +37,6 @@ "tsc": "tsc" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/core-interfaces": "workspace:~", "@microsoft/applicationinsights-web": "^2.8.11" }, diff --git a/packages/framework/client-logger/app-insights-logger/src/fluidAppInsightsLogger.ts b/packages/framework/client-logger/app-insights-logger/src/fluidAppInsightsLogger.ts index 0405b01aeee0..52adddaee559 100644 --- a/packages/framework/client-logger/app-insights-logger/src/fluidAppInsightsLogger.ts +++ b/packages/framework/client-logger/app-insights-logger/src/fluidAppInsightsLogger.ts @@ -7,7 +7,7 @@ import { ApplicationInsights } from "@microsoft/applicationinsights-web"; import { ITelemetryBaseEvent, ITelemetryBaseLogger } from "@fluidframework/core-interfaces"; /** - * An implementation of {@link @fluidframework/common-definitions#ITelemetryBaseLogger | ITelemetryBaseLogger} + * An implementation of {@link @fluidframework/core-interfaces#ITelemetryBaseLogger | ITelemetryBaseLogger} * that routes Fluid telemetry events to Azure App Insights using the App Insights trackEvent API. * The provided ApplicationInsights instance MUST be initialized with client.loadAppInsights() * or else logging will not occur. diff --git a/packages/framework/data-object-base/package.json b/packages/framework/data-object-base/package.json index 60eae024803b..f7866ac24074 100644 --- a/packages/framework/data-object-base/package.json +++ b/packages/framework/data-object-base/package.json @@ -60,7 +60,6 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-runtime": "workspace:~", diff --git a/packages/framework/data-object-base/src/lazyLoadedDataObject.ts b/packages/framework/data-object-base/src/lazyLoadedDataObject.ts index e73ad8a137e6..643c764f66e3 100644 --- a/packages/framework/data-object-base/src/lazyLoadedDataObject.ts +++ b/packages/framework/data-object-base/src/lazyLoadedDataObject.ts @@ -4,6 +4,7 @@ */ import { + IEvent, IFluidHandle, IFluidLoadable, IFluidRouter, @@ -16,7 +17,6 @@ import { IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions"; import { FluidObjectHandle } from "@fluidframework/datastore"; import { ISharedObject } from "@fluidframework/shared-object-base"; import { EventForwarder } from "@fluidframework/common-utils"; -import { IEvent } from "@fluidframework/common-definitions"; import { create404Response } from "@fluidframework/runtime-utils"; export abstract class LazyLoadedDataObject< diff --git a/packages/framework/fluid-static/package.json b/packages/framework/fluid-static/package.json index 9059292dda57..f927722d40a1 100644 --- a/packages/framework/fluid-static/package.json +++ b/packages/framework/fluid-static/package.json @@ -61,7 +61,6 @@ }, "dependencies": { "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-loader": "workspace:~", diff --git a/packages/framework/fluid-static/src/fluidContainer.ts b/packages/framework/fluid-static/src/fluidContainer.ts index f21cb41b0bd8..0c5da3ce6345 100644 --- a/packages/framework/fluid-static/src/fluidContainer.ts +++ b/packages/framework/fluid-static/src/fluidContainer.ts @@ -3,8 +3,7 @@ * Licensed under the MIT License. */ import { TypedEventEmitter } from "@fluidframework/common-utils"; -import { IFluidLoadable } from "@fluidframework/core-interfaces"; -import { IEvent, IEventProvider } from "@fluidframework/common-definitions"; +import { IEvent, IEventProvider, IFluidLoadable } from "@fluidframework/core-interfaces"; import { AttachState, IContainer, diff --git a/packages/framework/fluid-static/src/types.ts b/packages/framework/fluid-static/src/types.ts index 74141025facb..1b952b20eebf 100644 --- a/packages/framework/fluid-static/src/types.ts +++ b/packages/framework/fluid-static/src/types.ts @@ -3,8 +3,7 @@ * Licensed under the MIT License. */ -import { IEvent, IEventProvider } from "@fluidframework/common-definitions"; -import { IFluidLoadable } from "@fluidframework/core-interfaces"; +import { IEvent, IEventProvider, IFluidLoadable } from "@fluidframework/core-interfaces"; import { IChannelFactory } from "@fluidframework/datastore-definitions"; import { IFluidDataStoreFactory } from "@fluidframework/runtime-definitions"; diff --git a/packages/framework/oldest-client-observer/package.json b/packages/framework/oldest-client-observer/package.json index fa29a69b6446..c4c094435dc6 100644 --- a/packages/framework/oldest-client-observer/package.json +++ b/packages/framework/oldest-client-observer/package.json @@ -54,9 +54,9 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", + "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/protocol-definitions": "^1.1.0" }, "devDependencies": { diff --git a/packages/framework/oldest-client-observer/src/interfaces.ts b/packages/framework/oldest-client-observer/src/interfaces.ts index 016cc3a47bd5..8b0b9a026c3a 100644 --- a/packages/framework/oldest-client-observer/src/interfaces.ts +++ b/packages/framework/oldest-client-observer/src/interfaces.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -import { IEvent, IEventProvider } from "@fluidframework/common-definitions"; +import { IEvent, IEventProvider } from "@fluidframework/core-interfaces"; import { AttachState } from "@fluidframework/container-definitions"; import { IQuorumClients } from "@fluidframework/protocol-definitions"; diff --git a/packages/framework/tinylicious-client/src/interfaces.ts b/packages/framework/tinylicious-client/src/interfaces.ts index 625d5b74ef58..4880f0d61c0a 100644 --- a/packages/framework/tinylicious-client/src/interfaces.ts +++ b/packages/framework/tinylicious-client/src/interfaces.ts @@ -6,7 +6,7 @@ import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces"; import { IMember, IServiceAudience } from "@fluidframework/fluid-static"; import { IUser } from "@fluidframework/protocol-definitions"; import { ITokenProvider } from "@fluidframework/routerlicious-driver"; -// Re-export so developers can build loggers without pulling in common-definitions +// Re-export so developers can build loggers without pulling in core-interfaces export { ITelemetryBaseEvent, ITelemetryBaseLogger } from "@fluidframework/core-interfaces"; /** diff --git a/packages/loader/container-loader/package.json b/packages/loader/container-loader/package.json index 6c3771a57cba..f8d944589ca7 100644 --- a/packages/loader/container-loader/package.json +++ b/packages/loader/container-loader/package.json @@ -62,7 +62,6 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-utils": "workspace:~", diff --git a/packages/loader/container-loader/src/container.ts b/packages/loader/container-loader/src/container.ts index b95cedcf6eb1..7b322db8811f 100644 --- a/packages/loader/container-loader/src/container.ts +++ b/packages/loader/container-loader/src/container.ts @@ -7,7 +7,6 @@ import merge from "lodash/merge"; import { v4 as uuid } from "uuid"; -import { IEvent } from "@fluidframework/common-definitions"; import { TypedEventEmitter, assert, @@ -15,6 +14,7 @@ import { unreachableCase, } from "@fluidframework/common-utils"; import { + IEvent, ITelemetryProperties, TelemetryEventCategory, IRequest, diff --git a/packages/loader/container-loader/src/deltaManager.ts b/packages/loader/container-loader/src/deltaManager.ts index c7268ccfdc66..adf923ec879d 100644 --- a/packages/loader/container-loader/src/deltaManager.ts +++ b/packages/loader/container-loader/src/deltaManager.ts @@ -4,8 +4,11 @@ */ import { v4 as uuid } from "uuid"; -import { IEventProvider } from "@fluidframework/common-definitions"; -import { ITelemetryProperties, ITelemetryErrorEvent } from "@fluidframework/core-interfaces"; +import { + IEventProvider, + ITelemetryProperties, + ITelemetryErrorEvent, +} from "@fluidframework/core-interfaces"; import { ICriticalContainerError, IDeltaManager, diff --git a/packages/loader/container-loader/src/disposal.ts b/packages/loader/container-loader/src/disposal.ts index 9e328568b88f..1b049635c6d8 100644 --- a/packages/loader/container-loader/src/disposal.ts +++ b/packages/loader/container-loader/src/disposal.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. */ -import { IDisposable } from "@fluidframework/common-definitions"; +import { IDisposable } from "@fluidframework/core-interfaces"; /** * Returns a wrapper around the provided function, which will only invoke the inner function if the provided - * {@link @fluidframework/common-definitions#IDisposable | disposable} object has not yet been disposed. + * {@link @fluidframework/core-interfaces#IDisposable | disposable} object has not yet been disposed. * * @throws Will throw an error if the item has already been disposed. */ diff --git a/packages/loader/container-loader/src/noopHeuristic.ts b/packages/loader/container-loader/src/noopHeuristic.ts index 3ac94ab31e6c..f1d03fefb13d 100644 --- a/packages/loader/container-loader/src/noopHeuristic.ts +++ b/packages/loader/container-loader/src/noopHeuristic.ts @@ -6,7 +6,7 @@ import { assert, Timer, TypedEventEmitter } from "@fluidframework/common-utils"; import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"; import { isRuntimeMessage } from "@fluidframework/driver-utils"; -import { IEvent } from "@fluidframework/common-definitions"; +import { IEvent } from "@fluidframework/core-interfaces"; const defaultNoopTimeFrequency = 2000; const defaultNoopCountFrequency = 50; diff --git a/packages/loader/container-utils/package.json b/packages/loader/container-utils/package.json index 7ba8e193181b..e4cdc62fb1a8 100644 --- a/packages/loader/container-utils/package.json +++ b/packages/loader/container-utils/package.json @@ -61,9 +61,9 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", + "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/protocol-definitions": "^1.1.0", "@fluidframework/telemetry-utils": "workspace:~" }, diff --git a/packages/loader/container-utils/src/error.ts b/packages/loader/container-utils/src/error.ts index 33f09f89e0cd..5cd2cc6a40f4 100644 --- a/packages/loader/container-utils/src/error.ts +++ b/packages/loader/container-utils/src/error.ts @@ -20,7 +20,7 @@ import { NORMALIZED_ERROR_TYPE, ITelemetryLoggerExt, } from "@fluidframework/telemetry-utils"; -import { ITelemetryProperties } from "@fluidframework/common-definitions"; +import { ITelemetryProperties } from "@fluidframework/core-interfaces"; import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"; /** diff --git a/packages/loader/test-loader-utils/package.json b/packages/loader/test-loader-utils/package.json index 86b434647610..6a44184954f3 100644 --- a/packages/loader/test-loader-utils/package.json +++ b/packages/loader/test-loader-utils/package.json @@ -28,7 +28,6 @@ "tsc": "tsc" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/driver-definitions": "workspace:~", diff --git a/packages/runtime/container-runtime-definitions/package.json b/packages/runtime/container-runtime-definitions/package.json index 5958937ae696..f6d6d6764624 100644 --- a/packages/runtime/container-runtime-definitions/package.json +++ b/packages/runtime/container-runtime-definitions/package.json @@ -32,7 +32,6 @@ "typetests:prepare": "flub typetests --dir . --reset --previous --normalize" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/driver-definitions": "workspace:~", diff --git a/packages/runtime/container-runtime-definitions/src/containerRuntime.ts b/packages/runtime/container-runtime-definitions/src/containerRuntime.ts index d6d3cac50560..1e28cdfa5f11 100644 --- a/packages/runtime/container-runtime-definitions/src/containerRuntime.ts +++ b/packages/runtime/container-runtime-definitions/src/containerRuntime.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. */ -import { IEventProvider } from "@fluidframework/common-definitions"; import { AttachState, IDeltaManager, ILoaderOptions } from "@fluidframework/container-definitions"; import { + IEventProvider, IRequest, IResponse, IFluidRouter, diff --git a/packages/runtime/container-runtime/package.json b/packages/runtime/container-runtime/package.json index 012d2f5664ee..6629ef340050 100644 --- a/packages/runtime/container-runtime/package.json +++ b/packages/runtime/container-runtime/package.json @@ -62,7 +62,6 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-runtime-definitions": "workspace:~", diff --git a/packages/runtime/container-runtime/src/batchTracker.ts b/packages/runtime/container-runtime/src/batchTracker.ts index b3853a02ead4..1e010a40d83f 100644 --- a/packages/runtime/container-runtime/src/batchTracker.ts +++ b/packages/runtime/container-runtime/src/batchTracker.ts @@ -72,7 +72,7 @@ export class BatchTracker { * Track batch sizes in terms of op counts and processing times * * @param batchEventEmitter - event emitter which tracks the lifecycle of batch operations - * @param logger - See {@link @fluidframework/common-definitions#ITelemetryLoggerExt} + * @param logger - See {@link @fluidframework/core-interfaces#ITelemetryLoggerExt} * @param batchLengthThreshold - threshold for the length of a batch when to send an error event * @param batchCountSamplingRate - rate for batches for which to send an event with its characteristics */ diff --git a/packages/runtime/container-runtime/src/dataStoreContexts.ts b/packages/runtime/container-runtime/src/dataStoreContexts.ts index 62101249fcff..1890d05efc29 100644 --- a/packages/runtime/container-runtime/src/dataStoreContexts.ts +++ b/packages/runtime/container-runtime/src/dataStoreContexts.ts @@ -3,10 +3,9 @@ * Licensed under the MIT License. */ -import { ITelemetryBaseLogger } from "@fluidframework/common-definitions"; import { assert, Deferred } from "@fluidframework/common-utils"; import { Lazy } from "@fluidframework/core-utils"; -import { IDisposable } from "@fluidframework/core-interfaces"; +import { IDisposable, ITelemetryBaseLogger } from "@fluidframework/core-interfaces"; import { createChildLogger, ITelemetryLoggerExt } from "@fluidframework/telemetry-utils"; import { FluidDataStoreContext, LocalFluidDataStoreContext } from "./dataStoreContext"; diff --git a/packages/runtime/container-runtime/src/pendingStateManager.ts b/packages/runtime/container-runtime/src/pendingStateManager.ts index c0eb6b8e8dc6..4577d6ae1041 100644 --- a/packages/runtime/container-runtime/src/pendingStateManager.ts +++ b/packages/runtime/container-runtime/src/pendingStateManager.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -import { IDisposable } from "@fluidframework/common-definitions"; +import { IDisposable } from "@fluidframework/core-interfaces"; import { assert } from "@fluidframework/common-utils"; import { ICriticalContainerError } from "@fluidframework/container-definitions"; import { DataProcessingError } from "@fluidframework/container-utils"; diff --git a/packages/runtime/container-runtime/src/summary/orderedClientElection.ts b/packages/runtime/container-runtime/src/summary/orderedClientElection.ts index 228dc8050192..32bae942c63f 100644 --- a/packages/runtime/container-runtime/src/summary/orderedClientElection.ts +++ b/packages/runtime/container-runtime/src/summary/orderedClientElection.ts @@ -3,13 +3,12 @@ * Licensed under the MIT License. */ /* eslint-disable @rushstack/no-new-null */ -import { IEvent, IEventProvider } from "@fluidframework/common-definitions"; +import { IEvent, IEventProvider, ITelemetryBaseLogger } from "@fluidframework/core-interfaces"; import { ITelemetryLoggerExt, createChildLogger } from "@fluidframework/telemetry-utils"; import { assert, TypedEventEmitter } from "@fluidframework/common-utils"; import { IDeltaManager } from "@fluidframework/container-definitions"; import { UsageError } from "@fluidframework/container-utils"; import { IClient, IQuorumClients, ISequencedClient } from "@fluidframework/protocol-definitions"; -import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces"; import { summarizerClientType } from "./summarizerClientElection"; // helper types for recursive readonly. diff --git a/packages/runtime/container-runtime/src/summary/summarizerClientElection.ts b/packages/runtime/container-runtime/src/summary/summarizerClientElection.ts index a1dda7ec978b..9d606c723627 100644 --- a/packages/runtime/container-runtime/src/summary/summarizerClientElection.ts +++ b/packages/runtime/container-runtime/src/summary/summarizerClientElection.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -import { IEvent, IEventProvider } from "@fluidframework/common-definitions"; +import { IEvent, IEventProvider } from "@fluidframework/core-interfaces"; import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils"; import { TypedEventEmitter } from "@fluidframework/common-utils"; import { IClientDetails, MessageType } from "@fluidframework/protocol-definitions"; diff --git a/packages/runtime/container-runtime/src/summary/summarizerTypes.ts b/packages/runtime/container-runtime/src/summary/summarizerTypes.ts index 8af43589ec75..2691e92c072e 100644 --- a/packages/runtime/container-runtime/src/summary/summarizerTypes.ts +++ b/packages/runtime/container-runtime/src/summary/summarizerTypes.ts @@ -3,8 +3,7 @@ * Licensed under the MIT License. */ -import { IEvent, IEventProvider } from "@fluidframework/common-definitions"; -import { ITelemetryProperties } from "@fluidframework/core-interfaces"; +import { IEvent, IEventProvider, ITelemetryProperties } from "@fluidframework/core-interfaces"; import { ITelemetryLoggerExt, ITelemetryLoggerPropertyBag } from "@fluidframework/telemetry-utils"; import { ContainerWarning, IDeltaManager } from "@fluidframework/container-definitions"; import { diff --git a/packages/runtime/container-runtime/src/summary/summaryCollection.ts b/packages/runtime/container-runtime/src/summary/summaryCollection.ts index 61385c0163bf..d70822c16f09 100644 --- a/packages/runtime/container-runtime/src/summary/summaryCollection.ts +++ b/packages/runtime/container-runtime/src/summary/summaryCollection.ts @@ -3,8 +3,7 @@ * Licensed under the MIT License. */ -import { IEvent } from "@fluidframework/common-definitions"; -import { IDisposable } from "@fluidframework/core-interfaces"; +import { IDisposable, IEvent } from "@fluidframework/core-interfaces"; import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils"; import { Deferred, assert, TypedEventEmitter } from "@fluidframework/common-utils"; import { IDeltaManager } from "@fluidframework/container-definitions"; diff --git a/packages/runtime/container-runtime/src/summary/summaryManager.ts b/packages/runtime/container-runtime/src/summary/summaryManager.ts index 2f3db215f3fd..8d92882f3784 100644 --- a/packages/runtime/container-runtime/src/summary/summaryManager.ts +++ b/packages/runtime/container-runtime/src/summary/summaryManager.ts @@ -3,8 +3,12 @@ * Licensed under the MIT License. */ -import { IEvent, IEventProvider } from "@fluidframework/common-definitions"; -import { IDisposable, ITelemetryBaseLogger } from "@fluidframework/core-interfaces"; +import { + IDisposable, + IEvent, + IEventProvider, + ITelemetryBaseLogger, +} from "@fluidframework/core-interfaces"; import { assert } from "@fluidframework/common-utils"; import { createChildLogger, diff --git a/packages/runtime/container-runtime/src/test/dataStoreContext.spec.ts b/packages/runtime/container-runtime/src/test/dataStoreContext.spec.ts index b2c2f05e977c..69116a5e7c6b 100644 --- a/packages/runtime/container-runtime/src/test/dataStoreContext.spec.ts +++ b/packages/runtime/container-runtime/src/test/dataStoreContext.spec.ts @@ -5,13 +5,13 @@ import { strict as assert } from "assert"; -import { ITaggedTelemetryPropertyType } from "@fluidframework/common-definitions"; import { stringToBuffer } from "@fluidframework/common-utils"; import { LazyPromise } from "@fluidframework/core-utils"; import { AttachState, ContainerErrorType } from "@fluidframework/container-definitions"; import { FluidObject, IFluidHandleContext, + ITaggedTelemetryPropertyType, ITelemetryBaseLogger, } from "@fluidframework/core-interfaces"; import { IDocumentStorageService } from "@fluidframework/driver-definitions"; diff --git a/packages/runtime/datastore-definitions/package.json b/packages/runtime/datastore-definitions/package.json index 5740e85cbbf0..5b69815af97f 100644 --- a/packages/runtime/datastore-definitions/package.json +++ b/packages/runtime/datastore-definitions/package.json @@ -32,7 +32,6 @@ "typetests:prepare": "flub typetests --dir . --reset --previous --normalize" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/core-interfaces": "workspace:~", diff --git a/packages/runtime/datastore-definitions/src/dataStoreRuntime.ts b/packages/runtime/datastore-definitions/src/dataStoreRuntime.ts index 14b301f596e3..8653b0b7be77 100644 --- a/packages/runtime/datastore-definitions/src/dataStoreRuntime.ts +++ b/packages/runtime/datastore-definitions/src/dataStoreRuntime.ts @@ -3,8 +3,9 @@ * Licensed under the MIT License. */ -import { IEvent, IEventProvider } from "@fluidframework/common-definitions"; import { + IEvent, + IEventProvider, ITelemetryLogger, IDisposable, IFluidHandleContext, diff --git a/packages/runtime/datastore/package.json b/packages/runtime/datastore/package.json index 310884f20e7a..6860a513ae6f 100644 --- a/packages/runtime/datastore/package.json +++ b/packages/runtime/datastore/package.json @@ -61,7 +61,6 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-utils": "workspace:~", diff --git a/packages/runtime/runtime-definitions/package.json b/packages/runtime/runtime-definitions/package.json index 9e9033f48db9..5e269d40c70e 100644 --- a/packages/runtime/runtime-definitions/package.json +++ b/packages/runtime/runtime-definitions/package.json @@ -32,7 +32,6 @@ "typetests:prepare": "flub typetests --dir . --reset --previous --normalize" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/core-interfaces": "workspace:~", diff --git a/packages/runtime/runtime-definitions/src/dataStoreContext.ts b/packages/runtime/runtime-definitions/src/dataStoreContext.ts index cc5e2b2ae090..f57bc3d49f6a 100644 --- a/packages/runtime/runtime-definitions/src/dataStoreContext.ts +++ b/packages/runtime/runtime-definitions/src/dataStoreContext.ts @@ -3,8 +3,9 @@ * Licensed under the MIT License. */ -import { IEvent, IEventProvider } from "@fluidframework/common-definitions"; import { + IEvent, + IEventProvider, ITelemetryBaseLogger, IDisposable, IFluidRouter, diff --git a/packages/runtime/test-runtime-utils/package.json b/packages/runtime/test-runtime-utils/package.json index fc349d48a52c..dda60b943f19 100644 --- a/packages/runtime/test-runtime-utils/package.json +++ b/packages/runtime/test-runtime-utils/package.json @@ -58,7 +58,6 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/core-interfaces": "workspace:~", diff --git a/packages/test/mocha-test-setup/package.json b/packages/test/mocha-test-setup/package.json index 7d05b2389f7e..7eb5dd5f9b10 100644 --- a/packages/test/mocha-test-setup/package.json +++ b/packages/test/mocha-test-setup/package.json @@ -56,7 +56,6 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/test-driver-definitions": "workspace:~", "mocha": "^10.2.0" diff --git a/packages/test/test-app-insights-logger/package.json b/packages/test/test-app-insights-logger/package.json index a162408e1615..611637906a69 100644 --- a/packages/test/test-app-insights-logger/package.json +++ b/packages/test/test-app-insights-logger/package.json @@ -51,7 +51,6 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/test-driver-definitions": "workspace:~", "applicationinsights": "^2.1.9" diff --git a/packages/test/test-end-to-end-tests/package.json b/packages/test/test-end-to-end-tests/package.json index 05fc067acaff..cb43a19576eb 100644 --- a/packages/test/test-end-to-end-tests/package.json +++ b/packages/test/test-end-to-end-tests/package.json @@ -82,7 +82,6 @@ "@fluidframework/agent-scheduler": "workspace:~", "@fluidframework/aqueduct": "workspace:~", "@fluidframework/cell": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-loader": "workspace:~", diff --git a/packages/test/test-service-load/package.json b/packages/test/test-service-load/package.json index 0f9550cc17ef..f78c92a6dbf6 100644 --- a/packages/test/test-service-load/package.json +++ b/packages/test/test-service-load/package.json @@ -79,7 +79,6 @@ "@fluid-internal/test-drivers": "workspace:~", "@fluid-internal/test-pairwise-generator": "workspace:~", "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-loader": "workspace:~", diff --git a/packages/test/test-version-utils/package.json b/packages/test/test-version-utils/package.json index 9d18f1757107..68f91f474630 100644 --- a/packages/test/test-version-utils/package.json +++ b/packages/test/test-version-utils/package.json @@ -61,7 +61,6 @@ "@fluid-tools/version-tools": "^0.22.0", "@fluidframework/aqueduct": "workspace:~", "@fluidframework/cell": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-loader": "workspace:~", diff --git a/packages/tools/devtools/devtools-core/api-report/devtools-core.api.md b/packages/tools/devtools/devtools-core/api-report/devtools-core.api.md index c3a13f3e95b9..461f7617bfb2 100644 --- a/packages/tools/devtools/devtools-core/api-report/devtools-core.api.md +++ b/packages/tools/devtools/devtools-core/api-report/devtools-core.api.md @@ -9,8 +9,8 @@ import { ConnectionState } from '@fluidframework/container-loader'; import { IClient } from '@fluidframework/protocol-definitions'; import { IContainer } from '@fluidframework/container-definitions'; import { IDisposable } from '@fluidframework/core-interfaces'; -import { IEvent } from '@fluidframework/common-definitions'; -import { IEventProvider } from '@fluidframework/common-definitions'; +import { IEvent } from '@fluidframework/core-interfaces'; +import { IEventProvider } from '@fluidframework/core-interfaces'; import { IFluidLoadable } from '@fluidframework/core-interfaces'; import { ISharedObject } from '@fluidframework/shared-object-base'; import { ITelemetryBaseEvent } from '@fluidframework/core-interfaces'; diff --git a/packages/tools/devtools/devtools-core/package.json b/packages/tools/devtools/devtools-core/package.json index a90307b8c7c6..2e3e560f93d1 100644 --- a/packages/tools/devtools/devtools-core/package.json +++ b/packages/tools/devtools/devtools-core/package.json @@ -64,7 +64,6 @@ "dependencies": { "@fluid-experimental/tree2": "workspace:~", "@fluidframework/cell": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-loader": "workspace:~", diff --git a/packages/tools/devtools/devtools-core/src/ContainerDevtools.ts b/packages/tools/devtools/devtools-core/src/ContainerDevtools.ts index 3dfa90b73cb5..6d0b006f1a26 100644 --- a/packages/tools/devtools/devtools-core/src/ContainerDevtools.ts +++ b/packages/tools/devtools/devtools-core/src/ContainerDevtools.ts @@ -523,7 +523,7 @@ export class ContainerDevtools implements IContainerDevtools, HasContainerKey { } /** - * {@inheritDoc @fluidframework/common-definitions#IDisposable.disposed} + * {@inheritDoc @fluidframework/core-interfaces#IDisposable.disposed} */ public get disposed(): boolean { return this._disposed; diff --git a/packages/tools/devtools/devtools-core/src/FluidDevtools.ts b/packages/tools/devtools/devtools-core/src/FluidDevtools.ts index d59069ae3dd9..81ef962a5e8a 100644 --- a/packages/tools/devtools/devtools-core/src/FluidDevtools.ts +++ b/packages/tools/devtools/devtools-core/src/FluidDevtools.ts @@ -339,14 +339,14 @@ export class FluidDevtools implements IFluidDevtools { } /** - * {@inheritDoc @fluidframework/common-definitions#IDisposable.disposed} + * {@inheritDoc @fluidframework/core-interfaces#IDisposable.disposed} */ public get disposed(): boolean { return this._disposed; } /** - * {@inheritDoc @fluidframework/common-definitions#IDisposable.dispose} + * {@inheritDoc @fluidframework/core-interfaces#IDisposable.dispose} */ public dispose(): void { if (this.disposed) { diff --git a/packages/tools/devtools/devtools-core/src/IFluidDevtools.ts b/packages/tools/devtools/devtools-core/src/IFluidDevtools.ts index 05d8afd9eced..8a4b2118787d 100644 --- a/packages/tools/devtools/devtools-core/src/IFluidDevtools.ts +++ b/packages/tools/devtools/devtools-core/src/IFluidDevtools.ts @@ -18,7 +18,7 @@ import { ContainerKey } from "./CommonInterfaces"; * * The lifetime of the associated singleton is bound by that of the Window (globalThis), and it will be automatically * disposed of on Window unload. - * If you wish to dispose of it earlier, you may call its {@link @fluidframework/common-definitions#IDisposable.dispose} method. + * If you wish to dispose of it earlier, you may call its {@link @fluidframework/core-interfaces#IDisposable.dispose} method. * * @public */ diff --git a/packages/tools/devtools/devtools-core/src/data-visualization/DataVisualization.ts b/packages/tools/devtools/devtools-core/src/data-visualization/DataVisualization.ts index de77a1f60036..de285f4193c6 100644 --- a/packages/tools/devtools/devtools-core/src/data-visualization/DataVisualization.ts +++ b/packages/tools/devtools/devtools-core/src/data-visualization/DataVisualization.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. */ -import { IEvent } from "@fluidframework/common-definitions"; import { TypedEventEmitter } from "@fluidframework/common-utils"; import { IDisposable, + IEvent, IFluidHandle, IFluidLoadable, IProvideFluidHandle, diff --git a/packages/tools/devtools/devtools-core/src/messaging/MessageRelay.ts b/packages/tools/devtools/devtools-core/src/messaging/MessageRelay.ts index e1117f766138..3dea759b6e2c 100644 --- a/packages/tools/devtools/devtools-core/src/messaging/MessageRelay.ts +++ b/packages/tools/devtools/devtools-core/src/messaging/MessageRelay.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -import { IEvent, IEventProvider } from "@fluidframework/common-definitions"; +import { IEvent, IEventProvider } from "@fluidframework/core-interfaces"; import { IDevtoolsMessage, ISourcedDevtoolsMessage } from "./Messages"; /** @@ -28,7 +28,7 @@ export interface IMessageRelayEvents< * To send a message **to** the external recipient, call {@link IMessageRelay.postMessage}. * * To be notified when a message is received **from** the external sender, subscribe to the "message" event - * via {@link @fluidframework/common-definitions#IEventProvider.on}. + * via {@link @fluidframework/core-interfaces#IEventProvider.on}. * * @internal */ diff --git a/packages/tools/devtools/devtools-view/api-report/devtools-view.api.md b/packages/tools/devtools/devtools-view/api-report/devtools-view.api.md index da7b7003eef8..729f3ee9c8c6 100644 --- a/packages/tools/devtools/devtools-view/api-report/devtools-view.api.md +++ b/packages/tools/devtools/devtools-view/api-report/devtools-view.api.md @@ -7,8 +7,8 @@ import { IDevtoolsMessage } from '@fluid-experimental/devtools-core'; import { IMessageRelay } from '@fluid-experimental/devtools-core'; import { IMessageRelayEvents } from '@fluid-experimental/devtools-core'; -import { ITelemetryBaseEvent } from '@fluidframework/common-definitions'; -import { ITelemetryBaseLogger } from '@fluidframework/common-definitions'; +import { ITelemetryBaseEvent } from '@fluidframework/core-interfaces'; +import { ITelemetryBaseLogger } from '@fluidframework/core-interfaces'; import { default as React_2 } from 'react'; import { TypedEventEmitter } from '@fluidframework/common-utils'; diff --git a/packages/tools/devtools/devtools-view/package.json b/packages/tools/devtools/devtools-view/package.json index cc6d73717142..9522919c3359 100644 --- a/packages/tools/devtools/devtools-view/package.json +++ b/packages/tools/devtools/devtools-view/package.json @@ -42,10 +42,10 @@ "@fluentui/react-hooks": "^8.6.24", "@fluentui/react-icons": "^2.0.201", "@fluid-experimental/devtools-core": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-loader": "workspace:~", + "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/datastore-definitions": "workspace:~", "@fluidframework/driver-definitions": "workspace:~", "@fluidframework/protocol-definitions": "^1.1.0", diff --git a/packages/tools/devtools/devtools-view/src/DevtoolsPanel.tsx b/packages/tools/devtools/devtools-view/src/DevtoolsPanel.tsx index 9a611e813b9c..5a77e1247d04 100644 --- a/packages/tools/devtools/devtools-view/src/DevtoolsPanel.tsx +++ b/packages/tools/devtools/devtools-view/src/DevtoolsPanel.tsx @@ -5,7 +5,7 @@ import React from "react"; import { IMessageRelay } from "@fluid-experimental/devtools-core"; -import { ITelemetryBaseLogger } from "@fluidframework/common-definitions"; +import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces"; import { DevtoolsView } from "./DevtoolsView"; import { MessageRelayContext } from "./MessageRelayContext"; @@ -21,7 +21,7 @@ export interface DevtoolsPanelProps { messageRelay: IMessageRelay; /** - * An optional {@link @fluidframework/common-definitions#ITelemetryBaseLogger} instance that will be passed any usage + * An optional {@link @fluidframework/core-interfaces#ITelemetryBaseLogger} instance that will be passed any usage * telemetry generated by Devtools. * * @remarks diff --git a/packages/tools/devtools/devtools-view/src/DevtoolsView.tsx b/packages/tools/devtools/devtools-view/src/DevtoolsView.tsx index 8973a230cf8e..8b04410ea6fc 100644 --- a/packages/tools/devtools/devtools-view/src/DevtoolsView.tsx +++ b/packages/tools/devtools/devtools-view/src/DevtoolsView.tsx @@ -15,7 +15,7 @@ import { } from "@fluentui/react-components"; import { ArrowSync24Regular } from "@fluentui/react-icons"; -import { ITelemetryBaseLogger } from "@fluidframework/common-definitions"; +import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces"; import { createChildLogger } from "@fluidframework/telemetry-utils"; import { ContainerKey, diff --git a/packages/tools/devtools/devtools-view/src/TelemetryUtils.ts b/packages/tools/devtools/devtools-view/src/TelemetryUtils.ts index 3b149538230d..0bb4475c82c5 100644 --- a/packages/tools/devtools/devtools-view/src/TelemetryUtils.ts +++ b/packages/tools/devtools/devtools-view/src/TelemetryUtils.ts @@ -5,7 +5,7 @@ import React from "react"; import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils"; -import { ITelemetryBaseEvent, ITelemetryBaseLogger } from "@fluidframework/common-definitions"; +import { ITelemetryBaseEvent, ITelemetryBaseLogger } from "@fluidframework/core-interfaces"; /** * Context that provides a logger for Devtools to generate usage telemetry internally. diff --git a/packages/tools/devtools/devtools-view/src/index.ts b/packages/tools/devtools/devtools-view/src/index.ts index ee74edc8e97d..d761590041fb 100644 --- a/packages/tools/devtools/devtools-view/src/index.ts +++ b/packages/tools/devtools/devtools-view/src/index.ts @@ -21,4 +21,4 @@ export { WindowMessageRelay } from "./WindowMessageRelay"; // Convenience re-exports export { IMessageRelay } from "@fluid-experimental/devtools-core"; -export { ITelemetryBaseEvent, ITelemetryBaseLogger } from "@fluidframework/common-definitions"; +export { ITelemetryBaseEvent, ITelemetryBaseLogger } from "@fluidframework/core-interfaces"; diff --git a/packages/tools/devtools/devtools/package.json b/packages/tools/devtools/devtools/package.json index 137eec2fc43e..b8d58fc3120c 100644 --- a/packages/tools/devtools/devtools/package.json +++ b/packages/tools/devtools/devtools/package.json @@ -58,7 +58,6 @@ }, "dependencies": { "@fluid-experimental/devtools-core": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-utils": "workspace:~", "@fluidframework/core-interfaces": "workspace:~", diff --git a/packages/tools/devtools/devtools/src/index.ts b/packages/tools/devtools/devtools/src/index.ts index 3765a0edce6e..2e97bdaeb424 100644 --- a/packages/tools/devtools/devtools/src/index.ts +++ b/packages/tools/devtools/devtools/src/index.ts @@ -81,7 +81,7 @@ export interface ContainerDevtoolsProps extends HasContainerKey { * * The lifetime of the associated singleton is bound by that of the Window (globalThis), and it will be automatically * disposed of on Window unload. - * If you wish to dispose of it earlier, you may call its {@link @fluidframework/common-definitions#IDisposable.dispose} method. + * If you wish to dispose of it earlier, you may call its {@link @fluidframework/core-interfaces#IDisposable.dispose} method. * * @public */ diff --git a/packages/tools/fluid-runner/package.json b/packages/tools/fluid-runner/package.json index 11f35d6a7a83..b2bcf34ce4bd 100644 --- a/packages/tools/fluid-runner/package.json +++ b/packages/tools/fluid-runner/package.json @@ -60,7 +60,6 @@ }, "dependencies": { "@fluidframework/aqueduct": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-loader": "workspace:~", "@fluidframework/core-interfaces": "workspace:~", diff --git a/packages/tools/replay-tool/package.json b/packages/tools/replay-tool/package.json index e8e6c18d916e..8f5d37d7dd6e 100644 --- a/packages/tools/replay-tool/package.json +++ b/packages/tools/replay-tool/package.json @@ -35,7 +35,6 @@ "dependencies": { "@fluid-experimental/sequence-deprecated": "workspace:~", "@fluidframework/cell": "workspace:~", - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/container-definitions": "workspace:~", "@fluidframework/container-loader": "workspace:~", diff --git a/packages/utils/odsp-doclib-utils/package.json b/packages/utils/odsp-doclib-utils/package.json index 4d876bf9c9a3..74c40a8d2e3d 100644 --- a/packages/utils/odsp-doclib-utils/package.json +++ b/packages/utils/odsp-doclib-utils/package.json @@ -60,8 +60,8 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", + "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/driver-definitions": "workspace:~", "@fluidframework/driver-utils": "workspace:~", "@fluidframework/odsp-driver-definitions": "workspace:~", diff --git a/packages/utils/odsp-doclib-utils/src/odspErrorUtils.ts b/packages/utils/odsp-doclib-utils/src/odspErrorUtils.ts index 58d8b19d3699..2042a78fbc80 100644 --- a/packages/utils/odsp-doclib-utils/src/odspErrorUtils.ts +++ b/packages/utils/odsp-doclib-utils/src/odspErrorUtils.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -import { ITelemetryProperties } from "@fluidframework/common-definitions"; +import { ITelemetryProperties } from "@fluidframework/core-interfaces"; import { DriverErrorType } from "@fluidframework/driver-definitions"; import { IFluidErrorBase, LoggingError, numberFromString } from "@fluidframework/telemetry-utils"; import { diff --git a/packages/utils/telemetry-utils/package.json b/packages/utils/telemetry-utils/package.json index 3a5db36cfeaf..69ae3ab01a19 100644 --- a/packages/utils/telemetry-utils/package.json +++ b/packages/utils/telemetry-utils/package.json @@ -66,7 +66,6 @@ "temp-directory": "nyc/.nyc_output" }, "dependencies": { - "@fluidframework/common-definitions": "^0.20.1", "@fluidframework/common-utils": "^1.1.1", "@fluidframework/core-interfaces": "workspace:~", "@fluidframework/core-utils": "workspace:~", diff --git a/packages/utils/telemetry-utils/src/eventEmitterWithErrorHandling.ts b/packages/utils/telemetry-utils/src/eventEmitterWithErrorHandling.ts index 0bff1c8565f4..7d710c753cb3 100644 --- a/packages/utils/telemetry-utils/src/eventEmitterWithErrorHandling.ts +++ b/packages/utils/telemetry-utils/src/eventEmitterWithErrorHandling.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation and contributors. All rights reserved. * Licensed under the MIT License. */ -import { IEvent } from "@fluidframework/common-definitions"; +import { IEvent } from "@fluidframework/core-interfaces"; import { TypedEventEmitter, EventEmitterEventType } from "@fluidframework/common-utils"; /** diff --git a/packages/utils/telemetry-utils/src/sampledTelemetryHelper.ts b/packages/utils/telemetry-utils/src/sampledTelemetryHelper.ts index 61d9c78fce0d..16ba0f0d2312 100644 --- a/packages/utils/telemetry-utils/src/sampledTelemetryHelper.ts +++ b/packages/utils/telemetry-utils/src/sampledTelemetryHelper.ts @@ -45,7 +45,7 @@ interface Measurements { /** * Helper class that executes a specified code block and writes an - * {@link @fluidframework/common-definitions#ITelemetryPerformanceEvent} to a specified logger every time a specified + * {@link @fluidframework/core-interfaces#ITelemetryPerformanceEvent} to a specified logger every time a specified * number of executions is reached (or when the class is disposed). The `duration` field in the telemetry event is * the duration of the latest execution (sample) of the specified function. See the documentation of the * `includeAggregateMetrics` parameter for additional details that can be included. diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fd10b0a8198e..27a02b60c55a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -233,7 +233,6 @@ importers: '@fluidframework/azure-client': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-loader': workspace:~ '@fluidframework/eslint-config-fluid': ^2.0.0 @@ -279,7 +278,6 @@ importers: webpack-merge: ^5.8.0 dependencies: '@fluidframework/azure-client': link:../azure-client - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/routerlicious-driver': link:../../../packages/drivers/routerlicious-driver '@fluidframework/telemetry-utils': link:../../../packages/utils/telemetry-utils assert: 2.0.0 @@ -408,7 +406,6 @@ importers: '@fluidframework/azure-client': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-loader': workspace:~ @@ -447,7 +444,6 @@ importers: dependencies: '@fluidframework/aqueduct': link:../../../../packages/framework/aqueduct '@fluidframework/azure-client': link:../../azure-client - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../../../packages/common/container-definitions '@fluidframework/container-loader': link:../../../../packages/loader/container-loader @@ -497,7 +493,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-runtime': workspace:~ '@fluidframework/container-runtime-definitions': workspace:~ @@ -534,7 +529,6 @@ importers: '@fluid-experimental/attributable-map': link:../../../experimental/dds/attributable-map '@fluid-experimental/attributor': link:../../../packages/framework/attributor '@fluidframework/aqueduct': link:../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/container-definitions': link:../../../packages/common/container-definitions '@fluidframework/container-runtime': link:../../../packages/runtime/container-runtime '@fluidframework/container-runtime-definitions': link:../../../packages/runtime/container-runtime-definitions @@ -579,7 +573,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-runtime-definitions': workspace:~ '@fluidframework/core-interfaces': workspace:~ @@ -622,7 +615,6 @@ importers: '@fluid-example/example-utils': link:../../utils/example-utils '@fluid-experimental/react-inputs': link:../../../experimental/framework/react-inputs '@fluidframework/aqueduct': link:../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/container-definitions': link:../../../packages/common/container-definitions '@fluidframework/container-runtime-definitions': link:../../../packages/runtime/container-runtime-definitions '@fluidframework/core-interfaces': link:../../../packages/common/core-interfaces @@ -673,7 +665,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-runtime-definitions': workspace:~ '@fluidframework/core-interfaces': workspace:~ @@ -712,7 +703,6 @@ importers: dependencies: '@fluid-example/example-utils': link:../../utils/example-utils '@fluidframework/aqueduct': link:../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/container-definitions': link:../../../packages/common/container-definitions '@fluidframework/container-runtime-definitions': link:../../../packages/runtime/container-runtime-definitions '@fluidframework/core-interfaces': link:../../../packages/common/core-interfaces @@ -766,7 +756,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-runtime-definitions': workspace:~ '@fluidframework/core-interfaces': workspace:~ @@ -825,7 +814,6 @@ importers: '@fluid-example/multiview-slider-coordinate-view': link:../../data-objects/multiview/slider-coordinate-view '@fluid-example/prosemirror': link:../../data-objects/prosemirror '@fluidframework/aqueduct': link:../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/container-definitions': link:../../../packages/common/container-definitions '@fluidframework/container-runtime-definitions': link:../../../packages/runtime/container-runtime-definitions '@fluidframework/core-interfaces': link:../../../packages/common/core-interfaces @@ -887,10 +875,10 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-runtime-definitions': workspace:~ + '@fluidframework/core-interfaces': workspace:~ '@fluidframework/eslint-config-fluid': ^2.0.0 '@fluidframework/protocol-definitions': ^1.1.0 '@fluidframework/runtime-utils': workspace:~ @@ -922,10 +910,10 @@ importers: dependencies: '@fluid-example/example-utils': link:../../utils/example-utils '@fluid-experimental/data-objects': link:../../../experimental/framework/data-objects - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../../packages/common/container-definitions '@fluidframework/container-runtime-definitions': link:../../../packages/runtime/container-runtime-definitions + '@fluidframework/core-interfaces': link:../../../packages/common/core-interfaces '@fluidframework/protocol-definitions': 1.2.0 '@fluidframework/runtime-utils': link:../../../packages/runtime/runtime-utils '@fluidframework/tinylicious-client': link:../../../packages/framework/tinylicious-client @@ -967,7 +955,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-runtime-definitions': workspace:~ @@ -1007,7 +994,6 @@ importers: '@fluid-example/example-utils': link:../../utils/example-utils '@fluid-experimental/oldest-client-observer': link:../../../packages/framework/oldest-client-observer '@fluidframework/aqueduct': link:../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../../packages/common/container-definitions '@fluidframework/container-runtime-definitions': link:../../../packages/runtime/container-runtime-definitions @@ -1056,7 +1042,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/core-interfaces': workspace:~ '@fluidframework/datastore-definitions': workspace:~ @@ -1091,7 +1076,6 @@ importers: '@fluid-example/bubblebench-common': link:../common '@fluid-example/example-utils': link:../../../utils/example-utils '@fluidframework/aqueduct': link:../../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/container-definitions': link:../../../../packages/common/container-definitions '@fluidframework/core-interfaces': link:../../../../packages/common/core-interfaces '@fluidframework/datastore-definitions': link:../../../../packages/runtime/datastore-definitions @@ -1206,7 +1190,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/core-interfaces': workspace:~ '@fluidframework/datastore-definitions': workspace:~ @@ -1244,7 +1227,6 @@ importers: '@fluid-experimental/tree': link:../../../../experimental/dds/tree '@fluid-experimental/tree2': link:../../../../experimental/dds/tree2 '@fluidframework/aqueduct': link:../../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/container-definitions': link:../../../../packages/common/container-definitions '@fluidframework/core-interfaces': link:../../../../packages/common/core-interfaces '@fluidframework/datastore-definitions': link:../../../../packages/runtime/datastore-definitions @@ -1290,7 +1272,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/core-interfaces': workspace:~ '@fluidframework/datastore-definitions': workspace:~ @@ -1327,7 +1308,6 @@ importers: '@fluid-example/example-utils': link:../../../utils/example-utils '@fluid-experimental/sharejs-json1': link:../../../../experimental/dds/ot/sharejs/json1 '@fluidframework/aqueduct': link:../../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/container-definitions': link:../../../../packages/common/container-definitions '@fluidframework/core-interfaces': link:../../../../packages/common/core-interfaces '@fluidframework/datastore-definitions': link:../../../../packages/runtime/datastore-definitions @@ -1373,7 +1353,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/core-interfaces': workspace:~ '@fluidframework/datastore-definitions': workspace:~ @@ -1409,7 +1388,6 @@ importers: '@fluid-example/example-utils': link:../../../utils/example-utils '@fluid-experimental/tree': link:../../../../experimental/dds/tree '@fluidframework/aqueduct': link:../../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/container-definitions': link:../../../../packages/common/container-definitions '@fluidframework/core-interfaces': link:../../../../packages/common/core-interfaces '@fluidframework/datastore-definitions': link:../../../../packages/runtime/datastore-definitions @@ -1626,7 +1604,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/core-interfaces': workspace:~ '@fluidframework/eslint-config-fluid': ^2.0.0 '@fluidframework/ink': workspace:~ @@ -1662,7 +1639,6 @@ importers: dependencies: '@fluid-example/example-utils': link:../../utils/example-utils '@fluidframework/aqueduct': link:../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/core-interfaces': link:../../../packages/common/core-interfaces '@fluidframework/ink': link:../../../packages/dds/ink react: 17.0.2 @@ -1707,7 +1683,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/core-interfaces': workspace:~ '@fluidframework/counter': workspace:~ '@fluidframework/eslint-config-fluid': ^2.0.0 @@ -1742,7 +1717,6 @@ importers: dependencies: '@fluid-example/example-utils': link:../../utils/example-utils '@fluidframework/aqueduct': link:../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/core-interfaces': link:../../../packages/common/core-interfaces '@fluidframework/counter': link:../../../packages/dds/counter '@fluidframework/runtime-definitions': link:../../../packages/runtime/runtime-definitions @@ -1867,7 +1841,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/eslint-config-fluid': ^2.0.0 '@fluidframework/map': workspace:~ '@fluidframework/test-tools': ^0.2.158186 @@ -1899,7 +1872,6 @@ importers: dependencies: '@fluid-example/example-utils': link:../../utils/example-utils '@fluidframework/aqueduct': link:../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/map': link:../../../packages/dds/map '@fluidframework/view-interfaces': link:../../../packages/framework/view-interfaces react: 17.0.2 @@ -2089,7 +2061,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/core-interfaces': workspace:~ '@fluidframework/eslint-config-fluid': ^2.0.0 '@fluidframework/map': workspace:~ @@ -2119,7 +2090,6 @@ importers: '@fluid-example/multiview-coordinate-interface': link:../interface '@fluid-example/multiview-coordinate-model': link:../coordinate-model '@fluidframework/aqueduct': link:../../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/core-interfaces': link:../../../../packages/common/core-interfaces '@fluidframework/map': link:../../../../packages/dds/map devDependencies: @@ -2325,7 +2295,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/eslint-config-fluid': ^2.0.0 '@fluidframework/map': workspace:~ '@fluidframework/test-tools': ^0.2.158186 @@ -2353,7 +2322,6 @@ importers: dependencies: '@fluid-example/multiview-coordinate-interface': link:../interface '@fluidframework/aqueduct': link:../../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/map': link:../../../../packages/dds/map devDependencies: '@fluid-tools/webpack-fluid-loader': link:../../../../packages/tools/webpack-fluid-loader @@ -2951,7 +2919,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/core-interfaces': workspace:~ '@fluidframework/datastore-definitions': workspace:~ @@ -2985,7 +2952,6 @@ importers: dependencies: '@fluid-experimental/sequence-deprecated': link:../../../experimental/dds/sequence-deprecated '@fluidframework/aqueduct': link:../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/core-interfaces': link:../../../packages/common/core-interfaces '@fluidframework/datastore-definitions': link:../../../packages/runtime/datastore-definitions @@ -3030,7 +2996,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/core-interfaces': workspace:~ '@fluidframework/eslint-config-fluid': ^2.0.0 @@ -3061,7 +3026,6 @@ importers: '@fluid-example/example-utils': link:../../utils/example-utils '@fluid-example/table-document': link:../table-document '@fluidframework/aqueduct': link:../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/container-definitions': link:../../../packages/common/container-definitions '@fluidframework/core-interfaces': link:../../../packages/common/core-interfaces '@fluidframework/matrix': link:../../../packages/dds/matrix @@ -3190,7 +3154,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/core-interfaces': workspace:~ '@fluidframework/data-object-base': workspace:~ @@ -3247,7 +3210,6 @@ importers: dependencies: '@fluid-example/example-utils': link:../../utils/example-utils '@fluidframework/aqueduct': link:../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/core-interfaces': link:../../../packages/common/core-interfaces '@fluidframework/data-object-base': link:../../../packages/framework/data-object-base @@ -3315,7 +3277,6 @@ importers: '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 '@fluidframework/cell': workspace:~ - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-loader': workspace:~ @@ -3394,7 +3355,6 @@ importers: '@fluid-experimental/react-inputs': link:../../experimental/framework/react-inputs '@fluidframework/aqueduct': link:../../packages/framework/aqueduct '@fluidframework/cell': link:../../packages/dds/cell - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../packages/common/container-definitions '@fluidframework/container-loader': link:../../packages/loader/container-loader @@ -3542,7 +3502,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-loader': workspace:~ @@ -3576,7 +3535,6 @@ importers: dependencies: '@fluid-experimental/pact-map': link:../../../packages/dds/pact-map '@fluidframework/aqueduct': link:../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../../packages/common/container-definitions '@fluidframework/container-loader': link:../../../packages/loader/container-loader @@ -3619,7 +3577,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-loader': workspace:~ @@ -3660,7 +3617,6 @@ importers: dependencies: '@fluid-example/example-utils': link:../../utils/example-utils '@fluidframework/aqueduct': link:../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../../packages/common/container-definitions '@fluidframework/container-loader': link:../../../packages/loader/container-loader @@ -3712,7 +3668,6 @@ importers: '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 '@fluidframework/cell': workspace:~ - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-loader': workspace:~ @@ -3776,7 +3731,6 @@ importers: '@fluid-experimental/react-inputs': link:../../../experimental/framework/react-inputs '@fluidframework/aqueduct': link:../../../packages/framework/aqueduct '@fluidframework/cell': link:../../../packages/dds/cell - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../../packages/common/container-definitions '@fluidframework/container-loader': link:../../../packages/loader/container-loader @@ -3849,7 +3803,6 @@ importers: '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 '@fluidframework/cell': workspace:~ - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-loader': workspace:~ @@ -3913,7 +3866,6 @@ importers: '@fluid-experimental/react-inputs': link:../../../experimental/framework/react-inputs '@fluidframework/aqueduct': link:../../../packages/framework/aqueduct '@fluidframework/cell': link:../../../packages/dds/cell - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../../packages/common/container-definitions '@fluidframework/container-loader': link:../../../packages/loader/container-loader @@ -3984,7 +3936,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-loader': workspace:~ '@fluidframework/container-runtime-definitions': workspace:~ @@ -4025,7 +3976,6 @@ importers: dependencies: '@fluid-example/example-utils': link:../../utils/example-utils '@fluidframework/aqueduct': link:../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/container-definitions': link:../../../packages/common/container-definitions '@fluidframework/container-loader': link:../../../packages/loader/container-loader '@fluidframework/container-runtime-definitions': link:../../../packages/runtime/container-runtime-definitions @@ -4075,7 +4025,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-runtime-definitions': workspace:~ '@fluidframework/eslint-config-fluid': ^2.0.0 @@ -4110,7 +4059,6 @@ importers: dependencies: '@fluid-example/example-utils': link:../../utils/example-utils '@fluidframework/aqueduct': link:../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/container-definitions': link:../../../packages/common/container-definitions '@fluidframework/container-runtime-definitions': link:../../../packages/runtime/container-runtime-definitions '@fluidframework/runtime-utils': link:../../../packages/runtime/runtime-utils @@ -4154,7 +4102,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-runtime-definitions': workspace:~ '@fluidframework/eslint-config-fluid': ^2.0.0 @@ -4194,7 +4141,6 @@ importers: dependencies: '@fluid-example/example-utils': link:../../utils/example-utils '@fluidframework/aqueduct': link:../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/container-definitions': link:../../../packages/common/container-definitions '@fluidframework/container-runtime-definitions': link:../../../packages/runtime/container-runtime-definitions '@fluidframework/runtime-utils': link:../../../packages/runtime/runtime-utils @@ -5354,7 +5300,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-utils': workspace:~ '@fluidframework/core-interfaces': workspace:~ @@ -5385,7 +5330,6 @@ importers: rimraf: ^4.4.0 typescript: ~4.5.5 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-utils': link:../../../packages/loader/container-utils '@fluidframework/core-interfaces': link:../../../packages/common/core-interfaces @@ -5622,7 +5566,6 @@ importers: '@fluid-tools/benchmark': ^0.48.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-loader': workspace:~ @@ -5668,7 +5611,6 @@ importers: typescript: ~4.5.5 uuid: ^9.0.0 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../../packages/common/container-definitions '@fluidframework/core-interfaces': link:../../../packages/common/core-interfaces @@ -5792,7 +5734,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-loader': workspace:~ @@ -5838,7 +5779,6 @@ importers: typescript: ~4.5.5 uuid: ^9.0.0 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-runtime': link:../../../packages/runtime/container-runtime '@fluidframework/core-interfaces': link:../../../packages/common/core-interfaces @@ -5898,8 +5838,8 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 + '@fluidframework/core-interfaces': workspace:~ '@fluidframework/datastore-definitions': workspace:~ '@fluidframework/eslint-config-fluid': ^2.0.0 '@fluidframework/map': workspace:~ @@ -5916,8 +5856,8 @@ importers: typescript: ~4.5.5 dependencies: '@fluidframework/aqueduct': link:../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 + '@fluidframework/core-interfaces': link:../../../packages/common/core-interfaces '@fluidframework/datastore-definitions': link:../../../packages/runtime/datastore-definitions '@fluidframework/map': link:../../../packages/dds/map '@fluidframework/runtime-definitions': link:../../../packages/runtime/runtime-definitions @@ -5943,7 +5883,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/container-runtime': workspace:~ '@fluidframework/container-runtime-definitions': workspace:~ '@fluidframework/core-interfaces': workspace:~ @@ -5965,7 +5904,6 @@ importers: typescript: ~4.5.5 dependencies: '@fluidframework/aqueduct': link:../../../packages/framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/container-runtime': link:../../../packages/runtime/container-runtime '@fluidframework/container-runtime-definitions': link:../../../packages/runtime/container-runtime-definitions '@fluidframework/core-interfaces': link:../../../packages/common/core-interfaces @@ -5996,8 +5934,8 @@ importers: '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 '@fluidframework/cell': workspace:~ - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 + '@fluidframework/core-interfaces': workspace:~ '@fluidframework/eslint-config-fluid': ^2.0.0 '@fluidframework/merge-tree': workspace:~ '@fluidframework/sequence': workspace:~ @@ -6013,8 +5951,8 @@ importers: typescript: ~4.5.5 dependencies: '@fluidframework/cell': link:../../../packages/dds/cell - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 + '@fluidframework/core-interfaces': link:../../../packages/common/core-interfaces '@fluidframework/merge-tree': link:../../../packages/dds/merge-tree '@fluidframework/sequence': link:../../../packages/dds/sequence react: 17.0.2 @@ -6099,7 +6037,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/container-definitions-previous': npm:@fluidframework/container-definitions@2.0.0-internal.6.0.0 '@fluidframework/core-interfaces': workspace:~ '@fluidframework/driver-definitions': workspace:~ @@ -6116,7 +6053,6 @@ importers: rimraf: ^4.4.0 typescript: ~4.5.5 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/core-interfaces': link:../core-interfaces '@fluidframework/driver-definitions': link:../driver-definitions '@fluidframework/protocol-definitions': 1.2.0 @@ -6226,7 +6162,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/core-interfaces': workspace:~ '@fluidframework/driver-definitions-previous': npm:@fluidframework/driver-definitions@2.0.0-internal.6.0.0 '@fluidframework/eslint-config-fluid': ^2.0.0 @@ -6239,7 +6174,6 @@ importers: rimraf: ^4.4.0 typescript: ~4.5.5 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/core-interfaces': link:../core-interfaces '@fluidframework/protocol-definitions': 1.2.0 devDependencies: @@ -6455,7 +6389,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-utils': workspace:~ '@fluidframework/core-interfaces': workspace:~ @@ -6487,7 +6420,6 @@ importers: rimraf: ^4.4.0 typescript: ~4.5.5 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-utils': link:../../loader/container-utils '@fluidframework/core-interfaces': link:../../common/core-interfaces @@ -6533,7 +6465,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/core-interfaces': workspace:~ '@fluidframework/datastore-definitions': workspace:~ @@ -6573,7 +6504,6 @@ importers: typescript: ~4.5.5 uuid: ^9.0.0 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/core-interfaces': link:../../common/core-interfaces '@fluidframework/datastore-definitions': link:../../runtime/datastore-definitions @@ -6627,7 +6557,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-utils': workspace:~ @@ -6661,7 +6590,6 @@ importers: source-map-support: ^0.5.16 typescript: ~4.5.5 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../common/container-definitions '@fluidframework/container-utils': link:../../loader/container-utils @@ -6774,7 +6702,6 @@ importers: '@fluid-internal/test-dds-utils': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/core-interfaces': workspace:~ '@fluidframework/datastore-definitions': workspace:~ @@ -6804,7 +6731,6 @@ importers: rimraf: ^4.4.0 typescript: ~4.5.5 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/core-interfaces': link:../../common/core-interfaces '@fluidframework/datastore-definitions': link:../../runtime/datastore-definitions @@ -6911,7 +6837,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-utils': workspace:~ '@fluidframework/core-interfaces': workspace:~ @@ -6949,7 +6874,6 @@ importers: typescript: ~4.5.5 uuid: ^9.0.0 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-utils': link:../../loader/container-utils '@fluidframework/core-interfaces': link:../../common/core-interfaces @@ -6999,7 +6923,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-runtime': workspace:~ @@ -7035,7 +6958,6 @@ importers: typescript: ~4.5.5 uuid: ^9.0.0 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../common/container-definitions '@fluidframework/container-runtime': link:../../runtime/container-runtime @@ -7149,7 +7071,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-runtime-definitions': workspace:~ @@ -7181,7 +7102,6 @@ importers: rimraf: ^4.4.0 typescript: ~4.5.5 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../common/container-definitions '@fluidframework/container-runtime-definitions': link:../../runtime/container-runtime-definitions @@ -7613,7 +7533,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/core-interfaces': workspace:~ '@fluidframework/core-utils': workspace:~ @@ -7652,7 +7571,6 @@ importers: typescript: ~4.5.5 uuid: ^9.0.0 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/core-interfaces': link:../../common/core-interfaces '@fluidframework/core-utils': link:../../common/core-utils @@ -7784,7 +7702,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/core-interfaces': workspace:~ '@fluidframework/driver-definitions': workspace:~ @@ -7806,7 +7723,6 @@ importers: rimraf: ^4.4.0 typescript: ~4.5.5 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/core-interfaces': link:../../common/core-interfaces '@fluidframework/driver-definitions': link:../../common/driver-definitions @@ -7837,7 +7753,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/core-interfaces': workspace:~ '@fluidframework/driver-base': workspace:~ @@ -7879,7 +7794,6 @@ importers: url-parse: ^1.5.8 uuid: ^9.0.0 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/core-interfaces': link:../../common/core-interfaces '@fluidframework/driver-base': link:../driver-base @@ -8045,7 +7959,6 @@ importers: '@fluidframework/agent-scheduler-previous': npm:@fluidframework/agent-scheduler@2.0.0-internal.6.0.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-utils': workspace:~ @@ -8069,7 +7982,6 @@ importers: typescript: ~4.5.5 uuid: ^9.0.0 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../common/container-definitions '@fluidframework/container-utils': link:../../loader/container-utils @@ -8104,7 +8016,6 @@ importers: '@fluidframework/aqueduct-previous': npm:@fluidframework/aqueduct@2.0.0-internal.6.0.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-runtime': workspace:~ @@ -8138,7 +8049,6 @@ importers: typescript: ~4.5.5 uuid: ^9.0.0 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../common/container-definitions '@fluidframework/container-runtime': link:../../runtime/container-runtime @@ -8260,7 +8170,6 @@ importers: specifiers: '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/core-interfaces': workspace:~ '@fluidframework/mocha-test-setup': workspace:~ '@microsoft/api-extractor': ^7.34.4 @@ -8282,7 +8191,6 @@ importers: tslib: ^1.10.0 typescript: ~4.5.5 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/core-interfaces': link:../../../common/core-interfaces '@microsoft/applicationinsights-web': 2.8.13_tslib@1.14.1 devDependencies: @@ -8312,7 +8220,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-runtime': workspace:~ @@ -8339,7 +8246,6 @@ importers: rimraf: ^4.4.0 typescript: ~4.5.5 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../common/container-definitions '@fluidframework/container-runtime': link:../../runtime/container-runtime @@ -8488,7 +8394,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-loader': workspace:~ @@ -8521,7 +8426,6 @@ importers: typescript: ~4.5.5 dependencies: '@fluidframework/aqueduct': link:../aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../common/container-definitions '@fluidframework/container-loader': link:../../loader/container-loader @@ -8563,9 +8467,9 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ + '@fluidframework/core-interfaces': workspace:~ '@fluidframework/eslint-config-fluid': ^2.0.0 '@fluidframework/protocol-definitions': ^1.1.0 '@fluidframework/test-runtime-utils': workspace:~ @@ -8583,9 +8487,9 @@ importers: rimraf: ^4.4.0 typescript: ~4.5.5 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../common/container-definitions + '@fluidframework/core-interfaces': link:../../common/core-interfaces '@fluidframework/protocol-definitions': 1.2.0 devDependencies: '@fluid-internal/test-dds-utils': link:../../dds/test-dds-utils @@ -8954,7 +8858,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-loader-previous': npm:@fluidframework/container-loader@2.0.0-internal.6.0.0 @@ -8994,7 +8897,6 @@ importers: url: ^0.11.0 uuid: ^9.0.0 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../common/container-definitions '@fluidframework/container-utils': link:../container-utils @@ -9044,10 +8946,10 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-utils-previous': npm:@fluidframework/container-utils@2.0.0-internal.6.0.0 + '@fluidframework/core-interfaces': workspace:~ '@fluidframework/eslint-config-fluid': ^2.0.0 '@fluidframework/mocha-test-setup': workspace:~ '@fluidframework/protocol-definitions': ^1.1.0 @@ -9069,9 +8971,9 @@ importers: rimraf: ^4.4.0 typescript: ~4.5.5 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../common/container-definitions + '@fluidframework/core-interfaces': link:../../common/core-interfaces '@fluidframework/protocol-definitions': 1.2.0 '@fluidframework/telemetry-utils': link:../../utils/telemetry-utils devDependencies: @@ -9231,7 +9133,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/core-interfaces': workspace:~ '@fluidframework/driver-definitions': workspace:~ @@ -9244,7 +9145,6 @@ importers: rimraf: ^4.4.0 typescript: ~4.5.5 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/core-interfaces': link:../../common/core-interfaces '@fluidframework/driver-definitions': link:../../common/driver-definitions @@ -9268,7 +9168,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-runtime-definitions': workspace:~ @@ -9311,7 +9210,6 @@ importers: typescript: ~4.5.5 uuid: ^9.0.0 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../common/container-definitions '@fluidframework/container-runtime-definitions': link:../container-runtime-definitions @@ -9365,7 +9263,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-runtime-definitions-previous': npm:@fluidframework/container-runtime-definitions@2.0.0-internal.6.0.0 '@fluidframework/core-interfaces': workspace:~ @@ -9381,7 +9278,6 @@ importers: rimraf: ^4.4.0 typescript: ~4.5.5 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/container-definitions': link:../../common/container-definitions '@fluidframework/core-interfaces': link:../../common/core-interfaces '@fluidframework/driver-definitions': link:../../common/driver-definitions @@ -9406,7 +9302,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-utils': workspace:~ @@ -9443,7 +9338,6 @@ importers: typescript: ~4.5.5 uuid: ^9.0.0 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../common/container-definitions '@fluidframework/container-utils': link:../../loader/container-utils @@ -9489,7 +9383,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/core-interfaces': workspace:~ @@ -9505,7 +9398,6 @@ importers: rimraf: ^4.4.0 typescript: ~4.5.5 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../common/container-definitions '@fluidframework/core-interfaces': link:../../common/core-interfaces @@ -9530,7 +9422,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/core-interfaces': workspace:~ @@ -9547,7 +9438,6 @@ importers: rimraf: ^4.4.0 typescript: ~4.5.5 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../common/container-definitions '@fluidframework/core-interfaces': link:../../common/core-interfaces @@ -9642,7 +9532,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/core-interfaces': workspace:~ @@ -9679,7 +9568,6 @@ importers: typescript: ~4.5.5 uuid: ^9.0.0 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../common/container-definitions '@fluidframework/core-interfaces': link:../../common/core-interfaces @@ -9916,7 +9804,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/core-interfaces': workspace:~ '@fluidframework/eslint-config-fluid': ^2.0.0 '@fluidframework/mocha-test-setup-previous': npm:@fluidframework/mocha-test-setup@2.0.0-internal.6.0.0 @@ -9933,7 +9820,6 @@ importers: rimraf: ^4.4.0 typescript: ~4.5.5 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/core-interfaces': link:../../common/core-interfaces '@fluidframework/test-driver-definitions': link:../test-driver-definitions mocha: 10.2.0 @@ -10095,7 +9981,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/core-interfaces': workspace:~ '@fluidframework/eslint-config-fluid': ^2.0.0 '@fluidframework/test-driver-definitions': workspace:~ @@ -10113,7 +9998,6 @@ importers: start-server-and-test: ^1.11.7 typescript: ~4.5.5 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/core-interfaces': link:../../common/core-interfaces '@fluidframework/test-driver-definitions': link:../test-driver-definitions applicationinsights: 2.6.0 @@ -10267,7 +10151,6 @@ importers: '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 '@fluidframework/cell': workspace:~ - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-loader': workspace:~ @@ -10336,7 +10219,6 @@ importers: '@fluidframework/agent-scheduler': link:../../framework/agent-scheduler '@fluidframework/aqueduct': link:../../framework/aqueduct '@fluidframework/cell': link:../../dds/cell - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../common/container-definitions '@fluidframework/container-loader': link:../../loader/container-loader @@ -10448,7 +10330,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-loader': workspace:~ @@ -10489,7 +10370,6 @@ importers: '@fluid-internal/test-drivers': link:../test-drivers '@fluid-internal/test-pairwise-generator': link:../test-pairwise-generator '@fluidframework/aqueduct': link:../../framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../common/container-definitions '@fluidframework/container-loader': link:../../loader/container-loader @@ -10648,7 +10528,6 @@ importers: '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 '@fluidframework/cell': workspace:~ - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-loader': workspace:~ @@ -10705,7 +10584,6 @@ importers: '@fluid-tools/version-tools': 0.22.0 '@fluidframework/aqueduct': link:../../framework/aqueduct '@fluidframework/cell': link:../../dds/cell - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../common/container-definitions '@fluidframework/container-loader': link:../../loader/container-loader @@ -10767,7 +10645,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-utils': workspace:~ '@fluidframework/core-interfaces': workspace:~ @@ -10795,7 +10672,6 @@ importers: typescript: ~4.5.5 dependencies: '@fluid-experimental/devtools-core': link:../devtools-core - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-utils': link:../../../loader/container-utils '@fluidframework/core-interfaces': link:../../../common/core-interfaces @@ -10974,7 +10850,6 @@ importers: '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 '@fluidframework/cell': workspace:~ - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-loader': workspace:~ @@ -11015,7 +10890,6 @@ importers: dependencies: '@fluid-experimental/tree2': link:../../../../experimental/dds/tree2 '@fluidframework/cell': link:../../../dds/cell - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../../common/container-definitions '@fluidframework/container-loader': link:../../../loader/container-loader @@ -11197,7 +11071,6 @@ importers: '@fluid-experimental/devtools-core': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-loader': workspace:~ @@ -11244,10 +11117,10 @@ importers: '@fluentui/react-hooks': 8.6.24_q5o373oqrklnndq2vhekyuzhxi '@fluentui/react-icons': 2.0.201_react@17.0.2 '@fluid-experimental/devtools-core': link:../devtools-core - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../../common/container-definitions '@fluidframework/container-loader': link:../../../loader/container-loader + '@fluidframework/core-interfaces': link:../../../common/core-interfaces '@fluidframework/datastore-definitions': link:../../../runtime/datastore-definitions '@fluidframework/driver-definitions': link:../../../common/driver-definitions '@fluidframework/protocol-definitions': 1.2.0 @@ -11260,7 +11133,6 @@ importers: devDependencies: '@fluidframework/build-common': 2.0.0 '@fluidframework/build-tools': 0.22.0 - '@fluidframework/core-interfaces': link:../../../common/core-interfaces '@fluidframework/eslint-config-fluid': 2.0.0_kufnqfq7tb5rpdawkdb6g5smma '@fluidframework/shared-object-base': link:../../../dds/shared-object-base '@fluidframework/test-runtime-utils': link:../../../runtime/test-runtime-utils @@ -11352,7 +11224,6 @@ importers: '@fluidframework/aqueduct': workspace:~ '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-loader': workspace:~ '@fluidframework/core-interfaces': workspace:~ @@ -11381,7 +11252,6 @@ importers: yargs: 13.2.2 dependencies: '@fluidframework/aqueduct': link:../../framework/aqueduct - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/container-definitions': link:../../common/container-definitions '@fluidframework/container-loader': link:../../loader/container-loader '@fluidframework/core-interfaces': link:../../common/core-interfaces @@ -11420,7 +11290,6 @@ importers: '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 '@fluidframework/cell': workspace:~ - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/container-definitions': workspace:~ '@fluidframework/container-loader': workspace:~ @@ -11461,7 +11330,6 @@ importers: dependencies: '@fluid-experimental/sequence-deprecated': link:../../../experimental/dds/sequence-deprecated '@fluidframework/cell': link:../../dds/cell - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/container-definitions': link:../../common/container-definitions '@fluidframework/container-loader': link:../../loader/container-loader @@ -11620,8 +11488,8 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 + '@fluidframework/core-interfaces': workspace:~ '@fluidframework/driver-definitions': workspace:~ '@fluidframework/driver-utils': workspace:~ '@fluidframework/eslint-config-fluid': ^2.0.0 @@ -11645,8 +11513,8 @@ importers: rimraf: ^4.4.0 typescript: ~4.5.5 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 + '@fluidframework/core-interfaces': link:../../common/core-interfaces '@fluidframework/driver-definitions': link:../../common/driver-definitions '@fluidframework/driver-utils': link:../../loader/driver-utils '@fluidframework/odsp-driver-definitions': link:../../drivers/odsp-driver-definitions @@ -11679,7 +11547,6 @@ importers: '@fluid-tools/build-cli': ^0.22.0 '@fluidframework/build-common': ^2.0.0 '@fluidframework/build-tools': ^0.22.0 - '@fluidframework/common-definitions': ^0.20.1 '@fluidframework/common-utils': ^1.1.1 '@fluidframework/core-interfaces': workspace:~ '@fluidframework/core-utils': workspace:~ @@ -11709,7 +11576,6 @@ importers: typescript: ~4.5.5 uuid: ^9.0.0 dependencies: - '@fluidframework/common-definitions': 0.20.1 '@fluidframework/common-utils': 1.1.1 '@fluidframework/core-interfaces': link:../../common/core-interfaces '@fluidframework/core-utils': link:../../common/core-utils