diff --git a/.changeset/hip-results-press.md b/.changeset/hip-results-press.md new file mode 100644 index 000000000000..07540b7f8f85 --- /dev/null +++ b/.changeset/hip-results-press.md @@ -0,0 +1,18 @@ +--- +"@fluidframework/datastore-definitions": minor +"fluid-framework": minor +"@fluidframework/shared-object-base": minor +--- + +Remove several types from `@public` scope + +The following types have been moved from `@public` to `@alpha`: + +- `IFluidSerializer` +- `ISharedObjectEvents` +- `IChannelServices` +- `IChannelStorageService` +- `IDeltaConnection` +- `IDeltaHandler` + +These should not be needed by users of the declarative API, which is what `@public` is targeting. diff --git a/experimental/PropertyDDS/packages/property-dds/api-report/property-dds.api.md b/experimental/PropertyDDS/packages/property-dds/api-report/property-dds.api.md index 0002e1078109..97554e9e0b0d 100644 --- a/experimental/PropertyDDS/packages/property-dds/api-report/property-dds.api.md +++ b/experimental/PropertyDDS/packages/property-dds/api-report/property-dds.api.md @@ -6,10 +6,10 @@ import { IChannelAttributes } from '@fluidframework/datastore-definitions/internal'; import { IChannelFactory } from '@fluidframework/datastore-definitions/internal'; -import { IChannelServices } from '@fluidframework/datastore-definitions'; -import { IChannelStorageService } from '@fluidframework/datastore-definitions'; +import { IChannelServices } from '@fluidframework/datastore-definitions/internal'; +import { IChannelStorageService } from '@fluidframework/datastore-definitions/internal'; import { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions/internal'; -import { IFluidSerializer } from '@fluidframework/shared-object-base'; +import { IFluidSerializer } from '@fluidframework/shared-object-base/internal'; import { ISequencedDocumentMessage } from '@fluidframework/protocol-definitions'; import { ISharedObjectKind } from '@fluidframework/shared-object-base/internal'; import { IsoBuffer } from '@fluid-internal/client-utils'; diff --git a/experimental/PropertyDDS/packages/property-dds/src/propertyTree.ts b/experimental/PropertyDDS/packages/property-dds/src/propertyTree.ts index ff2abe00b780..ae77eab32541 100644 --- a/experimental/PropertyDDS/packages/property-dds/src/propertyTree.ts +++ b/experimental/PropertyDDS/packages/property-dds/src/propertyTree.ts @@ -18,19 +18,18 @@ import { NodeProperty, PropertyFactory, } from "@fluid-experimental/property-properties"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; import { IsoBuffer, bufferToString, stringToBuffer } from "@fluid-internal/client-utils"; import { AttachState } from "@fluidframework/container-definitions"; import { IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelStorageService, } from "@fluidframework/datastore-definitions/internal"; import { ISequencedDocumentMessage, MessageType } from "@fluidframework/protocol-definitions"; import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/internal"; import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; -import { SharedObject } from "@fluidframework/shared-object-base/internal"; +import { SharedObject, IFluidSerializer } from "@fluidframework/shared-object-base/internal"; import axios from "axios"; import { copy as cloneDeep } from "fastest-json-copy"; import { Packr } from "msgpackr"; diff --git a/experimental/PropertyDDS/packages/property-dds/src/propertyTreeExtFactories.ts b/experimental/PropertyDDS/packages/property-dds/src/propertyTreeExtFactories.ts index a70881cd6d5c..6eb14e22c1f0 100644 --- a/experimental/PropertyDDS/packages/property-dds/src/propertyTreeExtFactories.ts +++ b/experimental/PropertyDDS/packages/property-dds/src/propertyTreeExtFactories.ts @@ -6,11 +6,11 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ import { bufferToString, stringToBuffer } from "@fluid-internal/client-utils"; -import { IChannelServices } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { compress, decompress } from "lz4js"; import { deflate, inflate } from "pako"; diff --git a/experimental/PropertyDDS/packages/property-dds/src/propertyTreeFactory.ts b/experimental/PropertyDDS/packages/property-dds/src/propertyTreeFactory.ts index d9cbcc7fdbfc..cf6ea6ac9c02 100644 --- a/experimental/PropertyDDS/packages/property-dds/src/propertyTreeFactory.ts +++ b/experimental/PropertyDDS/packages/property-dds/src/propertyTreeFactory.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. */ -import { IChannelServices } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { createSharedObjectKind } from "@fluidframework/shared-object-base/internal"; diff --git a/experimental/dds/attributable-map/api-report/attributable-map.api.md b/experimental/dds/attributable-map/api-report/attributable-map.api.md index cc853803e99d..79ad9b133cbf 100644 --- a/experimental/dds/attributable-map/api-report/attributable-map.api.md +++ b/experimental/dds/attributable-map/api-report/attributable-map.api.md @@ -7,11 +7,11 @@ import { AttributionKey } from '@fluidframework/runtime-definitions/internal'; import { IEventThisPlaceHolder } from '@fluidframework/core-interfaces'; import { IFluidHandle } from '@fluidframework/core-interfaces'; -import { IFluidSerializer } from '@fluidframework/shared-object-base'; +import { IFluidSerializer } from '@fluidframework/shared-object-base/internal'; import { ISharedObject } from '@fluidframework/shared-object-base/internal'; -import { ISharedObjectEvents } from '@fluidframework/shared-object-base'; +import { ISharedObjectEvents } from '@fluidframework/shared-object-base/internal'; import { ISharedObjectKind } from '@fluidframework/shared-object-base/internal'; -import { SharedObjectKind } from '@fluidframework/shared-object-base'; +import { SharedObjectKind } from '@fluidframework/shared-object-base/internal'; // @internal export const AttributableMap: ISharedObjectKind & SharedObjectKind; diff --git a/experimental/dds/attributable-map/src/interfaces.ts b/experimental/dds/attributable-map/src/interfaces.ts index 8cb9471ddee4..3b86bf8a8044 100644 --- a/experimental/dds/attributable-map/src/interfaces.ts +++ b/experimental/dds/attributable-map/src/interfaces.ts @@ -5,8 +5,7 @@ import { IEventThisPlaceHolder } from "@fluidframework/core-interfaces"; import { AttributionKey } from "@fluidframework/runtime-definitions/internal"; -import { ISharedObjectEvents } from "@fluidframework/shared-object-base"; -import { ISharedObject } from "@fluidframework/shared-object-base/internal"; +import { ISharedObject, ISharedObjectEvents } from "@fluidframework/shared-object-base/internal"; /** * Type of "valueChanged" event parameter. * @internal diff --git a/experimental/dds/attributable-map/src/localValues.ts b/experimental/dds/attributable-map/src/localValues.ts index d57c95930dfb..6d0e652b0cca 100644 --- a/experimental/dds/attributable-map/src/localValues.ts +++ b/experimental/dds/attributable-map/src/localValues.ts @@ -6,8 +6,8 @@ import { IFluidHandle } from "@fluidframework/core-interfaces"; import { AttributionKey } from "@fluidframework/runtime-definitions/internal"; import { ISerializedHandle } from "@fluidframework/runtime-utils/internal"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; import { + IFluidSerializer, ValueType, parseHandles, serializeHandles, diff --git a/experimental/dds/attributable-map/src/map.ts b/experimental/dds/attributable-map/src/map.ts index 372f34058fbd..870d32a7cd35 100644 --- a/experimental/dds/attributable-map/src/map.ts +++ b/experimental/dds/attributable-map/src/map.ts @@ -3,11 +3,12 @@ * Licensed under the MIT License. */ -import { IChannelServices, IChannelStorageService } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, + IChannelStorageService, } from "@fluidframework/datastore-definitions/internal"; import { readAndParse } from "@fluidframework/driver-utils/internal"; import { ISequencedDocumentMessage, MessageType } from "@fluidframework/protocol-definitions"; @@ -17,8 +18,11 @@ import { AttributionKey, } from "@fluidframework/runtime-definitions/internal"; import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; -import { SharedObject, createSharedObjectKind } from "@fluidframework/shared-object-base/internal"; +import { + IFluidSerializer, + SharedObject, + createSharedObjectKind, +} from "@fluidframework/shared-object-base/internal"; import { ISharedMap, ISharedMapEvents } from "./interfaces.js"; import { AttributableMapKernel, IMapDataObjectSerializable, IMapOperation } from "./mapKernel.js"; diff --git a/experimental/dds/attributable-map/src/mapKernel.ts b/experimental/dds/attributable-map/src/mapKernel.ts index dab15274c3e6..05ddb0e8e0bd 100644 --- a/experimental/dds/attributable-map/src/mapKernel.ts +++ b/experimental/dds/attributable-map/src/mapKernel.ts @@ -8,8 +8,11 @@ import { IFluidHandle } from "@fluidframework/core-interfaces"; import { assert, unreachableCase } from "@fluidframework/core-utils/internal"; import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"; import { AttributionKey } from "@fluidframework/runtime-definitions/internal"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; -import { ValueType, bindHandles } from "@fluidframework/shared-object-base/internal"; +import { + IFluidSerializer, + ValueType, + bindHandles, +} from "@fluidframework/shared-object-base/internal"; // eslint-disable-next-line import/no-deprecated import { ISerializableValue, ISerializedValue, ISharedMapEvents } from "./interfaces.js"; diff --git a/experimental/dds/ot/ot/api-report/ot.api.md b/experimental/dds/ot/ot/api-report/ot.api.md index 18e2762df6eb..2a10b1d0ffe8 100644 --- a/experimental/dds/ot/ot/api-report/ot.api.md +++ b/experimental/dds/ot/ot/api-report/ot.api.md @@ -5,9 +5,9 @@ ```ts import { IChannelAttributes } from '@fluidframework/datastore-definitions/internal'; -import { IChannelStorageService } from '@fluidframework/datastore-definitions'; +import { IChannelStorageService } from '@fluidframework/datastore-definitions/internal'; import { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions/internal'; -import { IFluidSerializer } from '@fluidframework/shared-object-base'; +import { IFluidSerializer } from '@fluidframework/shared-object-base/internal'; import { ISequencedDocumentMessage } from '@fluidframework/protocol-definitions'; import { ISummaryTreeWithStats } from '@fluidframework/runtime-definitions/internal'; import { SharedObject } from '@fluidframework/shared-object-base/internal'; diff --git a/experimental/dds/ot/ot/src/ot.ts b/experimental/dds/ot/ot/src/ot.ts index 64a104b24379..3f7a411be601 100644 --- a/experimental/dds/ot/ot/src/ot.ts +++ b/experimental/dds/ot/ot/src/ot.ts @@ -5,15 +5,18 @@ import { bufferToString } from "@fluid-internal/client-utils"; import { assert } from "@fluidframework/core-utils/internal"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IFluidDataStoreRuntime, + IChannelStorageService, } from "@fluidframework/datastore-definitions/internal"; import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"; import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/internal"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; -import { SharedObject, createSingleBlobSummary } from "@fluidframework/shared-object-base/internal"; +import { + IFluidSerializer, + SharedObject, + createSingleBlobSummary, +} from "@fluidframework/shared-object-base/internal"; interface ISequencedOpInfo { client: string; diff --git a/experimental/dds/ot/ot/src/test/delta.ts b/experimental/dds/ot/ot/src/test/delta.ts index 773e9793bd3d..78908a02f1a1 100644 --- a/experimental/dds/ot/ot/src/test/delta.ts +++ b/experimental/dds/ot/ot/src/test/delta.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. */ -import { IChannelServices } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import Delta from "quill-delta"; diff --git a/experimental/dds/ot/ot/src/test/ot.stress.spec.ts b/experimental/dds/ot/ot/src/test/ot.stress.spec.ts index 34e581fd5838..9e7f596f7498 100644 --- a/experimental/dds/ot/ot/src/test/ot.stress.spec.ts +++ b/experimental/dds/ot/ot/src/test/ot.stress.spec.ts @@ -5,7 +5,7 @@ import { strict as assert } from "assert"; -import { IChannelServices } from "@fluidframework/datastore-definitions"; +import { IChannelServices } from "@fluidframework/datastore-definitions/internal"; import { MockContainerRuntimeFactoryForReconnection, MockContainerRuntimeForReconnection, diff --git a/experimental/dds/ot/sharejs/json1/api-report/sharejs-json1.api.md b/experimental/dds/ot/sharejs/json1/api-report/sharejs-json1.api.md index d9d01b6c3811..e296dc892f76 100644 --- a/experimental/dds/ot/sharejs/json1/api-report/sharejs-json1.api.md +++ b/experimental/dds/ot/sharejs/json1/api-report/sharejs-json1.api.md @@ -8,7 +8,7 @@ import { Doc } from 'ot-json1'; import { IChannel } from '@fluidframework/datastore-definitions/internal'; import { IChannelAttributes } from '@fluidframework/datastore-definitions/internal'; import { IChannelFactory } from '@fluidframework/datastore-definitions/internal'; -import { IChannelServices } from '@fluidframework/datastore-definitions'; +import { IChannelServices } from '@fluidframework/datastore-definitions/internal'; import { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions/internal'; import { JSONOp } from 'ot-json1'; import { Path } from 'ot-json1'; diff --git a/experimental/dds/ot/sharejs/json1/src/factory.ts b/experimental/dds/ot/sharejs/json1/src/factory.ts index cc75a67b44f1..927dd80d2cb6 100644 --- a/experimental/dds/ot/sharejs/json1/src/factory.ts +++ b/experimental/dds/ot/sharejs/json1/src/factory.ts @@ -3,12 +3,12 @@ * Licensed under the MIT License. */ -import { IChannelServices } from "@fluidframework/datastore-definitions"; import { IChannel, IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { SharedJson1 } from "./json1.js"; diff --git a/experimental/dds/sequence-deprecated/api-report/sequence-deprecated.api.md b/experimental/dds/sequence-deprecated/api-report/sequence-deprecated.api.md index aa347328e793..5ca5aec9a4cb 100644 --- a/experimental/dds/sequence-deprecated/api-report/sequence-deprecated.api.md +++ b/experimental/dds/sequence-deprecated/api-report/sequence-deprecated.api.md @@ -7,7 +7,7 @@ import { BaseSegment } from '@fluidframework/merge-tree/internal'; import { IChannelAttributes } from '@fluidframework/datastore-definitions/internal'; import { IChannelFactory } from '@fluidframework/datastore-definitions/internal'; -import { IChannelServices } from '@fluidframework/datastore-definitions'; +import { IChannelServices } from '@fluidframework/datastore-definitions/internal'; import { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions/internal'; import { IFluidHandle } from '@fluidframework/core-interfaces'; import { IJSONRunSegment } from '@fluidframework/sequence/internal'; diff --git a/experimental/dds/sequence-deprecated/src/sequenceFactory.ts b/experimental/dds/sequence-deprecated/src/sequenceFactory.ts index fc9e3f72d3c3..1b876875a181 100644 --- a/experimental/dds/sequence-deprecated/src/sequenceFactory.ts +++ b/experimental/dds/sequence-deprecated/src/sequenceFactory.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. */ -import { IChannelServices } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { IJSONSegment } from "@fluidframework/merge-tree/internal"; import { IJSONRunSegment, SubSequence } from "@fluidframework/sequence/internal"; diff --git a/experimental/dds/sequence-deprecated/src/sparsematrix.ts b/experimental/dds/sequence-deprecated/src/sparsematrix.ts index 13aea83173e8..2a0e836c4087 100644 --- a/experimental/dds/sequence-deprecated/src/sparsematrix.ts +++ b/experimental/dds/sequence-deprecated/src/sparsematrix.ts @@ -5,12 +5,12 @@ import { IFluidHandle } from "@fluidframework/core-interfaces"; import { assert } from "@fluidframework/core-utils/internal"; -import { IChannelServices } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, Jsonable, + IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { BaseSegment, diff --git a/experimental/dds/sequence-deprecated/src/test/sparseMatrix.spec.ts b/experimental/dds/sequence-deprecated/src/test/sparseMatrix.spec.ts index ccdeac930fa4..e4e5c01fcf5b 100644 --- a/experimental/dds/sequence-deprecated/src/test/sparseMatrix.spec.ts +++ b/experimental/dds/sequence-deprecated/src/test/sparseMatrix.spec.ts @@ -5,7 +5,7 @@ import { strict as assert } from "assert"; -import { IChannelServices } from "@fluidframework/datastore-definitions"; +import { IChannelServices } from "@fluidframework/datastore-definitions/internal"; import { MockContainerRuntimeFactory, MockContainerRuntimeFactoryForReconnection, diff --git a/experimental/dds/tree/api-report/experimental-tree.api.md b/experimental/dds/tree/api-report/experimental-tree.api.md index 35300f366dd8..c6866a8dc494 100644 --- a/experimental/dds/tree/api-report/experimental-tree.api.md +++ b/experimental/dds/tree/api-report/experimental-tree.api.md @@ -8,8 +8,8 @@ import { EventEmitterWithErrorHandling } from '@fluidframework/telemetry-utils/i import { IChannel } from '@fluidframework/datastore-definitions/internal'; import { IChannelAttributes } from '@fluidframework/datastore-definitions/internal'; import { IChannelFactory } from '@fluidframework/datastore-definitions/internal'; -import { IChannelServices } from '@fluidframework/datastore-definitions'; -import { IChannelStorageService } from '@fluidframework/datastore-definitions'; +import { IChannelServices } from '@fluidframework/datastore-definitions/internal'; +import { IChannelStorageService } from '@fluidframework/datastore-definitions/internal'; import { IDisposable } from '@fluidframework/core-interfaces'; import { IErrorEvent } from '@fluidframework/core-interfaces'; import { IEvent } from '@fluidframework/core-interfaces'; @@ -17,9 +17,9 @@ import { IExperimentalIncrementalSummaryContext } from '@fluidframework/runtime- import { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions/internal'; import { IFluidHandle } from '@fluidframework/core-interfaces'; import { IFluidLoadable } from '@fluidframework/core-interfaces'; -import { IFluidSerializer } from '@fluidframework/shared-object-base'; +import { IFluidSerializer } from '@fluidframework/shared-object-base/internal'; import { IGarbageCollectionData } from '@fluidframework/runtime-definitions/internal'; -import { ISharedObjectEvents } from '@fluidframework/shared-object-base'; +import { ISharedObjectEvents } from '@fluidframework/shared-object-base/internal'; import { ISummaryTreeWithStats } from '@fluidframework/runtime-definitions/internal'; import { ITelemetryBaseEvent } from '@fluidframework/core-interfaces'; import { ITelemetryBaseProperties } from '@fluidframework/core-interfaces'; diff --git a/experimental/dds/tree/src/SharedTree.ts b/experimental/dds/tree/src/SharedTree.ts index d1cc122bf46f..d732c4b63846 100644 --- a/experimental/dds/tree/src/SharedTree.ts +++ b/experimental/dds/tree/src/SharedTree.ts @@ -7,16 +7,21 @@ import { bufferToString } from '@fluid-internal/client-utils'; import { AttachState } from '@fluidframework/container-definitions'; import { ITelemetryBaseProperties } from '@fluidframework/core-interfaces'; import { assert } from '@fluidframework/core-utils/internal'; -import { IChannelServices, IChannelStorageService } from '@fluidframework/datastore-definitions'; import { IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, + IChannelStorageService, } from '@fluidframework/datastore-definitions/internal'; import { ISequencedDocumentMessage } from '@fluidframework/protocol-definitions'; import { ISummaryTreeWithStats, ITelemetryContext } from '@fluidframework/runtime-definitions/internal'; -import { IFluidSerializer, ISharedObjectEvents } from '@fluidframework/shared-object-base'; -import { SharedObject, createSingleBlobSummary } from '@fluidframework/shared-object-base/internal'; +import { + IFluidSerializer, + ISharedObjectEvents, + SharedObject, + createSingleBlobSummary, +} from '@fluidframework/shared-object-base/internal'; import { IEventSampler, ITelemetryLoggerPropertyBags, diff --git a/experimental/dds/tree/src/Summary.ts b/experimental/dds/tree/src/Summary.ts index 20cf316e79e1..37fea91173b8 100644 --- a/experimental/dds/tree/src/Summary.ts +++ b/experimental/dds/tree/src/Summary.ts @@ -4,8 +4,7 @@ */ import type { IFluidHandle } from '@fluidframework/core-interfaces'; -import { IFluidSerializer } from '@fluidframework/shared-object-base'; -import { serializeHandles } from '@fluidframework/shared-object-base/internal'; +import { IFluidSerializer, serializeHandles } from '@fluidframework/shared-object-base/internal'; import { fail } from './Common.js'; import type { EditHandle } from './EditLog.js'; diff --git a/experimental/dds/tree/src/SummaryBackCompatibility.ts b/experimental/dds/tree/src/SummaryBackCompatibility.ts index 2644ec539bef..1d74bed4d9d6 100644 --- a/experimental/dds/tree/src/SummaryBackCompatibility.ts +++ b/experimental/dds/tree/src/SummaryBackCompatibility.ts @@ -4,7 +4,7 @@ */ import type { ITelemetryBaseProperties } from '@fluidframework/core-interfaces'; -import type { IFluidSerializer } from '@fluidframework/shared-object-base'; +import type { IFluidSerializer } from '@fluidframework/shared-object-base/internal'; import { fail } from './Common.js'; import { getNumberOfHandlesFromEditLogSummary } from './EditLog.js'; diff --git a/experimental/dds/tree/src/migration-shim/migrationDeltaHandler.ts b/experimental/dds/tree/src/migration-shim/migrationDeltaHandler.ts index 7f1ae6f21c6d..239c44140cee 100644 --- a/experimental/dds/tree/src/migration-shim/migrationDeltaHandler.ts +++ b/experimental/dds/tree/src/migration-shim/migrationDeltaHandler.ts @@ -4,8 +4,7 @@ */ import { assert } from '@fluidframework/core-utils/internal'; -import { type IDeltaHandler } from '@fluidframework/datastore-definitions'; -import { type IChannelAttributes } from '@fluidframework/datastore-definitions/internal'; +import { type IChannelAttributes, type IDeltaHandler } from '@fluidframework/datastore-definitions/internal'; import { type ISequencedDocumentMessage, MessageType } from '@fluidframework/protocol-definitions'; import { type IOpContents, type IShimDeltaHandler } from './types.js'; diff --git a/experimental/dds/tree/src/migration-shim/migrationShim.ts b/experimental/dds/tree/src/migration-shim/migrationShim.ts index 82ec750e77c5..ee9123a39d8a 100644 --- a/experimental/dds/tree/src/migration-shim/migrationShim.ts +++ b/experimental/dds/tree/src/migration-shim/migrationShim.ts @@ -7,12 +7,12 @@ import { type EventEmitterEventType } from '@fluid-internal/client-utils'; import { AttachState } from '@fluidframework/container-definitions'; import { type IEvent, type IFluidHandle, type IFluidLoadable } from '@fluidframework/core-interfaces'; import { assert } from '@fluidframework/core-utils/internal'; -import { type IChannelServices } from '@fluidframework/datastore-definitions'; import { type IChannelAttributes, IChannelFactory, type IFluidDataStoreRuntime, type IChannel, + type IChannelServices, } from '@fluidframework/datastore-definitions/internal'; import type { SessionId } from '@fluidframework/id-compressor'; import type { IIdCompressorCore } from '@fluidframework/id-compressor/internal'; diff --git a/experimental/dds/tree/src/migration-shim/migrationShimFactory.ts b/experimental/dds/tree/src/migration-shim/migrationShimFactory.ts index 4bb4d801b438..8e596a19c9be 100644 --- a/experimental/dds/tree/src/migration-shim/migrationShimFactory.ts +++ b/experimental/dds/tree/src/migration-shim/migrationShimFactory.ts @@ -4,11 +4,11 @@ */ import { assert } from '@fluidframework/core-utils/internal'; -import { type IChannelServices } from '@fluidframework/datastore-definitions'; import { type IChannelAttributes, type IChannelFactory, type IFluidDataStoreRuntime, + type IChannelServices, } from '@fluidframework/datastore-definitions/internal'; import { type ITree } from '@fluidframework/tree'; diff --git a/experimental/dds/tree/src/migration-shim/sharedTreeDeltaHandler.ts b/experimental/dds/tree/src/migration-shim/sharedTreeDeltaHandler.ts index fc7a77707d62..cdbf20f2dc94 100644 --- a/experimental/dds/tree/src/migration-shim/sharedTreeDeltaHandler.ts +++ b/experimental/dds/tree/src/migration-shim/sharedTreeDeltaHandler.ts @@ -4,8 +4,7 @@ */ import { assert } from '@fluidframework/core-utils/internal'; -import { type IDeltaHandler } from '@fluidframework/datastore-definitions'; -import { type IChannelAttributes } from '@fluidframework/datastore-definitions/internal'; +import { type IChannelAttributes, type IDeltaHandler } from '@fluidframework/datastore-definitions/internal'; import { type ISequencedDocumentMessage, MessageType } from '@fluidframework/protocol-definitions'; import { type IOpContents, type IShimDeltaHandler } from './types.js'; diff --git a/experimental/dds/tree/src/migration-shim/sharedTreeShim.ts b/experimental/dds/tree/src/migration-shim/sharedTreeShim.ts index aae51906e056..42bb608739d0 100644 --- a/experimental/dds/tree/src/migration-shim/sharedTreeShim.ts +++ b/experimental/dds/tree/src/migration-shim/sharedTreeShim.ts @@ -6,12 +6,12 @@ import { AttachState } from '@fluidframework/container-definitions'; import { type IFluidHandle, type IFluidLoadable } from '@fluidframework/core-interfaces'; import { assert } from '@fluidframework/core-utils/internal'; -import { type IChannelServices } from '@fluidframework/datastore-definitions'; import { type IChannel, type IChannelAttributes, type IChannelFactory, type IFluidDataStoreRuntime, + type IChannelServices, } from '@fluidframework/datastore-definitions/internal'; import { type IExperimentalIncrementalSummaryContext, diff --git a/experimental/dds/tree/src/migration-shim/sharedTreeShimFactory.ts b/experimental/dds/tree/src/migration-shim/sharedTreeShimFactory.ts index abea529bc927..4161e83f1974 100644 --- a/experimental/dds/tree/src/migration-shim/sharedTreeShimFactory.ts +++ b/experimental/dds/tree/src/migration-shim/sharedTreeShimFactory.ts @@ -4,11 +4,11 @@ */ import { assert } from '@fluidframework/core-utils/internal'; -import { type IChannelServices } from '@fluidframework/datastore-definitions'; import { type IChannelAttributes, type IChannelFactory, type IFluidDataStoreRuntime, + type IChannelServices, } from '@fluidframework/datastore-definitions/internal'; import type { ITree } from '@fluidframework/tree'; diff --git a/experimental/dds/tree/src/migration-shim/shimChannelServices.ts b/experimental/dds/tree/src/migration-shim/shimChannelServices.ts index 2034ad5de7fc..113b6d8ffb22 100644 --- a/experimental/dds/tree/src/migration-shim/shimChannelServices.ts +++ b/experimental/dds/tree/src/migration-shim/shimChannelServices.ts @@ -7,7 +7,7 @@ import { type IChannelServices, type IChannelStorageService, type IDeltaConnection, -} from '@fluidframework/datastore-definitions'; +} from '@fluidframework/datastore-definitions/internal'; /** * ShimChannelServices wraps an existing IChannelServices object and provides a new ShimDeltaConnection diff --git a/experimental/dds/tree/src/migration-shim/shimDeltaConnection.ts b/experimental/dds/tree/src/migration-shim/shimDeltaConnection.ts index 3e9efc6eda34..2db09aa488f9 100644 --- a/experimental/dds/tree/src/migration-shim/shimDeltaConnection.ts +++ b/experimental/dds/tree/src/migration-shim/shimDeltaConnection.ts @@ -5,8 +5,11 @@ import { type IFluidHandle } from '@fluidframework/core-interfaces'; import { assert } from '@fluidframework/core-utils/internal'; -import { type IDeltaConnection, type IDeltaHandler } from '@fluidframework/datastore-definitions'; -import { type IChannelAttributes } from '@fluidframework/datastore-definitions/internal'; +import { + type IChannelAttributes, + type IDeltaConnection, + type IDeltaHandler, +} from '@fluidframework/datastore-definitions/internal'; import { type IShimDeltaHandler, type IUnstampedContents } from './types.js'; diff --git a/experimental/dds/tree/src/migration-shim/types.ts b/experimental/dds/tree/src/migration-shim/types.ts index eefa7e576a2a..97ac2686f04d 100644 --- a/experimental/dds/tree/src/migration-shim/types.ts +++ b/experimental/dds/tree/src/migration-shim/types.ts @@ -3,8 +3,12 @@ * Licensed under the MIT License. */ -import { type IChannelServices, type IDeltaHandler } from '@fluidframework/datastore-definitions'; -import { type IChannel, type IChannelAttributes } from '@fluidframework/datastore-definitions/internal'; +import { + type IChannel, + type IChannelAttributes, + type IChannelServices, + type IDeltaHandler, +} from '@fluidframework/datastore-definitions/internal'; import { type ITree } from '@fluidframework/tree'; import { type SharedTree as LegacySharedTree } from '../SharedTree.js'; diff --git a/experimental/dds/tree/src/test/utilities/TestSerializer.ts b/experimental/dds/tree/src/test/utilities/TestSerializer.ts index d1205c7ae258..358ff93a888d 100644 --- a/experimental/dds/tree/src/test/utilities/TestSerializer.ts +++ b/experimental/dds/tree/src/test/utilities/TestSerializer.ts @@ -5,7 +5,7 @@ import { IFluidHandle, IRequest, IResponse } from '@fluidframework/core-interfaces'; import { FluidHandleBase } from '@fluidframework/runtime-utils/internal'; -import { IFluidSerializer } from '@fluidframework/shared-object-base'; +import { IFluidSerializer } from '@fluidframework/shared-object-base/internal'; export class TestFluidSerializer implements IFluidSerializer { public constructor() {} diff --git a/packages/common/container-definitions/api-report/container-definitions.api.md b/packages/common/container-definitions/api-report/container-definitions.api.md index 9d79d5484233..920aa7df46f6 100644 --- a/packages/common/container-definitions/api-report/container-definitions.api.md +++ b/packages/common/container-definitions/api-report/container-definitions.api.md @@ -75,7 +75,7 @@ export interface ContainerWarning extends IErrorBase_2 { export interface IAudience extends IEventProvider { getMember(clientId: string): IClient | undefined; getMembers(): Map; - getSelf: () => ISelf | undefined; + getSelf(): ISelf | undefined; } // @public @@ -462,8 +462,8 @@ export interface IRuntimeFactory extends IProvideRuntimeFactory { // @public export interface ISelf { - client?: IClient; - clientId: string; + readonly client?: IClient; + readonly clientId: string; } // @alpha diff --git a/packages/common/container-definitions/src/audience.ts b/packages/common/container-definitions/src/audience.ts index f03ddf04bf19..a4e6d767ebe6 100644 --- a/packages/common/container-definitions/src/audience.ts +++ b/packages/common/container-definitions/src/audience.ts @@ -60,7 +60,7 @@ export interface ISelf { * clientId of current or previous connection (if client is in disconnected or reconnecting / catching up state) * It changes only when client has reconnected, caught up with latest ops. */ - clientId: string; + readonly clientId: string; /** * Information about current client (including user identity, connection properties), supplied by ordering service when @@ -72,7 +72,7 @@ export interface ISelf { * 2) Container is in the process of establishing new connection. Information about old connection is already reset * (old clientId is no longer in list of members), but clientId has not yet changed to a new value. */ - client?: IClient; + readonly client?: IClient; } /** @@ -141,5 +141,5 @@ export interface IAudience extends IEventProvider { * 1. Such clientId is not present in Audience * 2. Client is not fully caught up */ - getSelf: () => ISelf | undefined; + getSelf(): ISelf | undefined; } diff --git a/packages/dds/cell/api-report/cell.api.md b/packages/dds/cell/api-report/cell.api.md index b503ab71ae14..dcf34b79eb59 100644 --- a/packages/dds/cell/api-report/cell.api.md +++ b/packages/dds/cell/api-report/cell.api.md @@ -7,10 +7,10 @@ import { AttributionKey } from '@fluidframework/runtime-definitions/internal'; import { IChannelAttributes } from '@fluidframework/datastore-definitions/internal'; import { IChannelFactory } from '@fluidframework/datastore-definitions/internal'; -import { IChannelServices } from '@fluidframework/datastore-definitions'; +import { IChannelServices } from '@fluidframework/datastore-definitions/internal'; import { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions/internal'; import { ISharedObject } from '@fluidframework/shared-object-base/internal'; -import { ISharedObjectEvents } from '@fluidframework/shared-object-base'; +import { ISharedObjectEvents } from '@fluidframework/shared-object-base/internal'; import { ISharedObjectKind } from '@fluidframework/shared-object-base/internal'; import { Serializable } from '@fluidframework/datastore-definitions/internal'; import { SharedObjectKind } from '@fluidframework/shared-object-base/internal'; diff --git a/packages/dds/cell/src/cell.ts b/packages/dds/cell/src/cell.ts index f3342abcd8ac..8f9a62e0aeed 100644 --- a/packages/dds/cell/src/cell.ts +++ b/packages/dds/cell/src/cell.ts @@ -4,11 +4,11 @@ */ import { assert, unreachableCase } from "@fluidframework/core-utils/internal"; -import { type IChannelStorageService } from "@fluidframework/datastore-definitions"; import { type IChannelAttributes, type IFluidDataStoreRuntime, type Serializable, + type IChannelStorageService, } from "@fluidframework/datastore-definitions/internal"; import { readAndParse } from "@fluidframework/driver-utils/internal"; import { type ISequencedDocumentMessage, MessageType } from "@fluidframework/protocol-definitions"; @@ -16,7 +16,7 @@ import { type ISummaryTreeWithStats, type AttributionKey, } from "@fluidframework/runtime-definitions/internal"; -import { type IFluidSerializer } from "@fluidframework/shared-object-base"; +import { type IFluidSerializer } from "@fluidframework/shared-object-base/internal"; import { SharedObject, createSingleBlobSummary } from "@fluidframework/shared-object-base/internal"; import { diff --git a/packages/dds/cell/src/cellFactory.ts b/packages/dds/cell/src/cellFactory.ts index 1bdad536609f..97f4eabe4821 100644 --- a/packages/dds/cell/src/cellFactory.ts +++ b/packages/dds/cell/src/cellFactory.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. */ -import { type IChannelServices } from "@fluidframework/datastore-definitions"; import { type IChannelAttributes, type IChannelFactory, type IFluidDataStoreRuntime, + type IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { createSharedObjectKind } from "@fluidframework/shared-object-base/internal"; diff --git a/packages/dds/cell/src/interfaces.ts b/packages/dds/cell/src/interfaces.ts index 3a9df9b37f27..c90ccac72e98 100644 --- a/packages/dds/cell/src/interfaces.ts +++ b/packages/dds/cell/src/interfaces.ts @@ -5,8 +5,10 @@ import { type Serializable } from "@fluidframework/datastore-definitions/internal"; import { type AttributionKey } from "@fluidframework/runtime-definitions/internal"; -import { type ISharedObjectEvents } from "@fluidframework/shared-object-base"; -import { type ISharedObject } from "@fluidframework/shared-object-base/internal"; +import { + type ISharedObject, + type ISharedObjectEvents, +} from "@fluidframework/shared-object-base/internal"; /** * Events emitted by {@link ISharedCell}. diff --git a/packages/dds/counter/api-report/counter.api.md b/packages/dds/counter/api-report/counter.api.md index de0e2d75518f..35fca6628587 100644 --- a/packages/dds/counter/api-report/counter.api.md +++ b/packages/dds/counter/api-report/counter.api.md @@ -5,7 +5,7 @@ ```ts import { ISharedObject } from '@fluidframework/shared-object-base/internal'; -import { ISharedObjectEvents } from '@fluidframework/shared-object-base'; +import { ISharedObjectEvents } from '@fluidframework/shared-object-base/internal'; import { ISharedObjectKind } from '@fluidframework/shared-object-base/internal'; import { SharedObjectKind } from '@fluidframework/shared-object-base/internal'; diff --git a/packages/dds/counter/src/counter.ts b/packages/dds/counter/src/counter.ts index 3ffd66935fbd..c01b9f62c133 100644 --- a/packages/dds/counter/src/counter.ts +++ b/packages/dds/counter/src/counter.ts @@ -4,15 +4,15 @@ */ import { assert } from "@fluidframework/core-utils/internal"; -import { type IChannelStorageService } from "@fluidframework/datastore-definitions"; import { type IChannelAttributes, type IFluidDataStoreRuntime, + type IChannelStorageService, } from "@fluidframework/datastore-definitions/internal"; import { readAndParse } from "@fluidframework/driver-utils/internal"; import { type ISequencedDocumentMessage, MessageType } from "@fluidframework/protocol-definitions"; import { type ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/internal"; -import { type IFluidSerializer } from "@fluidframework/shared-object-base"; +import { type IFluidSerializer } from "@fluidframework/shared-object-base/internal"; import { SharedObject, createSingleBlobSummary } from "@fluidframework/shared-object-base/internal"; import { type ISharedCounter, type ISharedCounterEvents } from "./interfaces.js"; diff --git a/packages/dds/counter/src/counterFactory.ts b/packages/dds/counter/src/counterFactory.ts index 4890774430d7..47646dbb66db 100644 --- a/packages/dds/counter/src/counterFactory.ts +++ b/packages/dds/counter/src/counterFactory.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. */ -import { type IChannelServices } from "@fluidframework/datastore-definitions"; import { type IChannelAttributes, type IChannelFactory, type IFluidDataStoreRuntime, + type IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { createSharedObjectKind } from "@fluidframework/shared-object-base/internal"; diff --git a/packages/dds/counter/src/interfaces.ts b/packages/dds/counter/src/interfaces.ts index f6e5c428baf9..afdab635f6bc 100644 --- a/packages/dds/counter/src/interfaces.ts +++ b/packages/dds/counter/src/interfaces.ts @@ -3,8 +3,10 @@ * Licensed under the MIT License. */ -import { type ISharedObjectEvents } from "@fluidframework/shared-object-base"; -import { type ISharedObject } from "@fluidframework/shared-object-base/internal"; +import { + type ISharedObject, + type ISharedObjectEvents, +} from "@fluidframework/shared-object-base/internal"; /** * Events sent by {@link ISharedCounter}. diff --git a/packages/dds/ink/api-report/ink.api.md b/packages/dds/ink/api-report/ink.api.md index 96a387d2eedb..08dfbf0288d0 100644 --- a/packages/dds/ink/api-report/ink.api.md +++ b/packages/dds/ink/api-report/ink.api.md @@ -6,13 +6,13 @@ import { IChannelAttributes } from '@fluidframework/datastore-definitions/internal'; import { IChannelFactory } from '@fluidframework/datastore-definitions/internal'; -import { IChannelServices } from '@fluidframework/datastore-definitions'; -import { IChannelStorageService } from '@fluidframework/datastore-definitions'; +import { IChannelServices } from '@fluidframework/datastore-definitions/internal'; +import { IChannelStorageService } from '@fluidframework/datastore-definitions/internal'; import { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions/internal'; -import { IFluidSerializer } from '@fluidframework/shared-object-base'; +import { IFluidSerializer } from '@fluidframework/shared-object-base/internal'; import { ISequencedDocumentMessage } from '@fluidframework/protocol-definitions'; import { ISharedObject } from '@fluidframework/shared-object-base/internal'; -import { ISharedObjectEvents } from '@fluidframework/shared-object-base'; +import { ISharedObjectEvents } from '@fluidframework/shared-object-base/internal'; import { ISummaryTreeWithStats } from '@fluidframework/runtime-definitions/internal'; import { SharedObject } from '@fluidframework/shared-object-base/internal'; diff --git a/packages/dds/ink/src/ink.ts b/packages/dds/ink/src/ink.ts index 9d08a095ca42..1b4c04ad83ed 100644 --- a/packages/dds/ink/src/ink.ts +++ b/packages/dds/ink/src/ink.ts @@ -3,16 +3,19 @@ * Licensed under the MIT License. */ -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IFluidDataStoreRuntime, + IChannelStorageService, } from "@fluidframework/datastore-definitions/internal"; import { readAndParse } from "@fluidframework/driver-utils/internal"; import { ISequencedDocumentMessage, MessageType } from "@fluidframework/protocol-definitions"; import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/internal"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; -import { SharedObject, createSingleBlobSummary } from "@fluidframework/shared-object-base/internal"; +import { + IFluidSerializer, + SharedObject, + createSingleBlobSummary, +} from "@fluidframework/shared-object-base/internal"; import { v4 as uuid } from "uuid"; import { InkFactory } from "./inkFactory.js"; diff --git a/packages/dds/ink/src/inkFactory.ts b/packages/dds/ink/src/inkFactory.ts index 78497c30be20..5021ceee6187 100644 --- a/packages/dds/ink/src/inkFactory.ts +++ b/packages/dds/ink/src/inkFactory.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. */ -import { IChannelServices } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { ISharedObject } from "@fluidframework/shared-object-base/internal"; diff --git a/packages/dds/ink/src/interfaces.ts b/packages/dds/ink/src/interfaces.ts index e579571f0c08..58a3198fb0d0 100644 --- a/packages/dds/ink/src/interfaces.ts +++ b/packages/dds/ink/src/interfaces.ts @@ -3,8 +3,7 @@ * Licensed under the MIT License. */ -import { ISharedObjectEvents } from "@fluidframework/shared-object-base"; -import { ISharedObject } from "@fluidframework/shared-object-base/internal"; +import { ISharedObject, ISharedObjectEvents } from "@fluidframework/shared-object-base/internal"; /** * Data about a single point in an ink stroke diff --git a/packages/dds/map/api-report/map.api.md b/packages/dds/map/api-report/map.api.md index f94ec7ce795c..05b54c0c6196 100644 --- a/packages/dds/map/api-report/map.api.md +++ b/packages/dds/map/api-report/map.api.md @@ -6,14 +6,14 @@ import type { IChannelAttributes } from '@fluidframework/datastore-definitions/internal'; import type { IChannelFactory } from '@fluidframework/datastore-definitions/internal'; -import type { IChannelServices } from '@fluidframework/datastore-definitions'; +import type { IChannelServices } from '@fluidframework/datastore-definitions/internal'; import type { IDisposable } from '@fluidframework/core-interfaces'; import type { IEvent } from '@fluidframework/core-interfaces'; import type { IEventProvider } from '@fluidframework/core-interfaces'; import type { IEventThisPlaceHolder } from '@fluidframework/core-interfaces'; import type { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions/internal'; import type { ISharedObject } from '@fluidframework/shared-object-base/internal'; -import type { ISharedObjectEvents } from '@fluidframework/shared-object-base'; +import type { ISharedObjectEvents } from '@fluidframework/shared-object-base/internal'; import { ISharedObjectKind } from '@fluidframework/shared-object-base/internal'; import { SharedObjectKind } from '@fluidframework/shared-object-base/internal'; diff --git a/packages/dds/map/src/directory.ts b/packages/dds/map/src/directory.ts index ce492586804d..6db03f3a0825 100644 --- a/packages/dds/map/src/directory.ts +++ b/packages/dds/map/src/directory.ts @@ -5,10 +5,10 @@ import { TypedEventEmitter } from "@fluid-internal/client-utils"; import { assert, unreachableCase } from "@fluidframework/core-utils/internal"; -import type { IChannelStorageService } from "@fluidframework/datastore-definitions"; import type { IChannelAttributes, IFluidDataStoreRuntime, + IChannelStorageService, } from "@fluidframework/datastore-definitions/internal"; import { readAndParse } from "@fluidframework/driver-utils/internal"; import { RedBlackTree } from "@fluidframework/merge-tree/internal"; @@ -18,7 +18,7 @@ import type { ITelemetryContext, } from "@fluidframework/runtime-definitions/internal"; import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal"; -import type { IFluidSerializer } from "@fluidframework/shared-object-base"; +import type { IFluidSerializer } from "@fluidframework/shared-object-base/internal"; import { SharedObject, ValueType, parseHandles } from "@fluidframework/shared-object-base/internal"; import { type ITelemetryLoggerExt, UsageError } from "@fluidframework/telemetry-utils/internal"; import path from "path-browserify"; diff --git a/packages/dds/map/src/directoryFactory.ts b/packages/dds/map/src/directoryFactory.ts index 74ae6cc320f5..fcee48735ea6 100644 --- a/packages/dds/map/src/directoryFactory.ts +++ b/packages/dds/map/src/directoryFactory.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. */ -import type { IChannelServices } from "@fluidframework/datastore-definitions"; import type { IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { createSharedObjectKind } from "@fluidframework/shared-object-base/internal"; diff --git a/packages/dds/map/src/interfaces.ts b/packages/dds/map/src/interfaces.ts index 260086ef6f90..3a375274bd1e 100644 --- a/packages/dds/map/src/interfaces.ts +++ b/packages/dds/map/src/interfaces.ts @@ -9,8 +9,10 @@ import type { IEventProvider, IEventThisPlaceHolder, } from "@fluidframework/core-interfaces"; -import type { ISharedObjectEvents } from "@fluidframework/shared-object-base"; -import type { ISharedObject } from "@fluidframework/shared-object-base/internal"; +import type { + ISharedObject, + ISharedObjectEvents, +} from "@fluidframework/shared-object-base/internal"; /** * Type of "valueChanged" event parameter. diff --git a/packages/dds/map/src/localValues.ts b/packages/dds/map/src/localValues.ts index 7608895665f6..3f4bb893e5ff 100644 --- a/packages/dds/map/src/localValues.ts +++ b/packages/dds/map/src/localValues.ts @@ -5,7 +5,7 @@ import type { IFluidHandle } from "@fluidframework/core-interfaces"; import type { ISerializedHandle } from "@fluidframework/runtime-utils/internal"; -import type { IFluidSerializer } from "@fluidframework/shared-object-base"; +import type { IFluidSerializer } from "@fluidframework/shared-object-base/internal"; import { ValueType, parseHandles, diff --git a/packages/dds/map/src/map.ts b/packages/dds/map/src/map.ts index 9bd5b63e0d3e..14459814b43c 100644 --- a/packages/dds/map/src/map.ts +++ b/packages/dds/map/src/map.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. */ -import type { IChannelStorageService } from "@fluidframework/datastore-definitions"; import type { IChannelAttributes, IFluidDataStoreRuntime, + IChannelStorageService, } from "@fluidframework/datastore-definitions/internal"; import { readAndParse } from "@fluidframework/driver-utils/internal"; import { MessageType, type ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"; @@ -15,7 +15,7 @@ import type { ITelemetryContext, } from "@fluidframework/runtime-definitions/internal"; import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal"; -import type { IFluidSerializer } from "@fluidframework/shared-object-base"; +import type { IFluidSerializer } from "@fluidframework/shared-object-base/internal"; import { SharedObject } from "@fluidframework/shared-object-base/internal"; import type { ISharedMap, ISharedMapEvents } from "./interfaces.js"; diff --git a/packages/dds/map/src/mapFactory.ts b/packages/dds/map/src/mapFactory.ts index ff9d96055c7d..fff85b446c8d 100644 --- a/packages/dds/map/src/mapFactory.ts +++ b/packages/dds/map/src/mapFactory.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. */ -import type { IChannelServices } from "@fluidframework/datastore-definitions"; import type { IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { createSharedObjectKind } from "@fluidframework/shared-object-base/internal"; diff --git a/packages/dds/map/src/mapKernel.ts b/packages/dds/map/src/mapKernel.ts index 8fd67de9add4..ce9567b6cc13 100644 --- a/packages/dds/map/src/mapKernel.ts +++ b/packages/dds/map/src/mapKernel.ts @@ -6,7 +6,7 @@ import type { TypedEventEmitter } from "@fluid-internal/client-utils"; import type { IFluidHandle } from "@fluidframework/core-interfaces"; import { assert, unreachableCase } from "@fluidframework/core-utils/internal"; -import type { IFluidSerializer } from "@fluidframework/shared-object-base"; +import type { IFluidSerializer } from "@fluidframework/shared-object-base/internal"; import { ValueType, bindHandles } from "@fluidframework/shared-object-base/internal"; import type { ISharedMapEvents } from "./interfaces.js"; diff --git a/packages/dds/matrix/api-report/matrix.api.md b/packages/dds/matrix/api-report/matrix.api.md index fee0daa0f30f..2118ed3529e1 100644 --- a/packages/dds/matrix/api-report/matrix.api.md +++ b/packages/dds/matrix/api-report/matrix.api.md @@ -7,7 +7,7 @@ import { IChannel } from '@fluidframework/datastore-definitions/internal'; import { IChannelAttributes } from '@fluidframework/datastore-definitions/internal'; import { IChannelFactory } from '@fluidframework/datastore-definitions/internal'; -import { IChannelServices } from '@fluidframework/datastore-definitions'; +import { IChannelServices } from '@fluidframework/datastore-definitions/internal'; import { IEvent } from '@fluidframework/core-interfaces'; import { IEventProvider } from '@fluidframework/core-interfaces'; import { IEventThisPlaceHolder } from '@fluidframework/core-interfaces'; diff --git a/packages/dds/matrix/src/matrix.ts b/packages/dds/matrix/src/matrix.ts index 04aa77b6a3cc..a37ef9238fa7 100644 --- a/packages/dds/matrix/src/matrix.ts +++ b/packages/dds/matrix/src/matrix.ts @@ -9,11 +9,11 @@ import { type IEventProvider, } from "@fluidframework/core-interfaces"; import { assert, unreachableCase } from "@fluidframework/core-utils/internal"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IFluidDataStoreRuntime, type IChannel, + IChannelStorageService, } from "@fluidframework/datastore-definitions/internal"; import { // eslint-disable-next-line import/no-deprecated @@ -29,8 +29,11 @@ import { import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"; import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/internal"; import { ObjectStoragePartition, SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal"; -import { IFluidSerializer, ISharedObjectEvents } from "@fluidframework/shared-object-base"; -import { SharedObject } from "@fluidframework/shared-object-base/internal"; +import { + IFluidSerializer, + ISharedObjectEvents, + SharedObject, +} from "@fluidframework/shared-object-base/internal"; import { UsageError } from "@fluidframework/telemetry-utils/internal"; import { IMatrixConsumer, IMatrixProducer, IMatrixReader, IMatrixWriter } from "@tiny-calc/nano"; import Deque from "double-ended-queue"; diff --git a/packages/dds/matrix/src/permutationvector.ts b/packages/dds/matrix/src/permutationvector.ts index 0b775a32d96f..6b253e052ba9 100644 --- a/packages/dds/matrix/src/permutationvector.ts +++ b/packages/dds/matrix/src/permutationvector.ts @@ -5,8 +5,10 @@ import { IFluidHandle, ITelemetryBaseLogger } from "@fluidframework/core-interfaces"; import { assert } from "@fluidframework/core-utils/internal"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; -import { IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions/internal"; +import { + IFluidDataStoreRuntime, + IChannelStorageService, +} from "@fluidframework/datastore-definitions/internal"; import { BaseSegment, // eslint-disable-next-line import/no-deprecated Client, @@ -21,7 +23,7 @@ import { import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"; import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/internal"; import { ObjectStoragePartition, SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; +import { IFluidSerializer } from "@fluidframework/shared-object-base/internal"; import { createChildLogger } from "@fluidframework/telemetry-utils/internal"; import { HandleCache } from "./handlecache.js"; diff --git a/packages/dds/matrix/src/runtime.ts b/packages/dds/matrix/src/runtime.ts index 7fdf4a02ba30..2480fd36bd63 100644 --- a/packages/dds/matrix/src/runtime.ts +++ b/packages/dds/matrix/src/runtime.ts @@ -3,12 +3,12 @@ * Licensed under the MIT License. */ -import { IChannelServices } from "@fluidframework/datastore-definitions"; import { IChannel, IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { createSharedObjectKind } from "@fluidframework/shared-object-base/internal"; diff --git a/packages/dds/matrix/src/serialization.ts b/packages/dds/matrix/src/serialization.ts index 98c3ec1abc73..3f561e78e201 100644 --- a/packages/dds/matrix/src/serialization.ts +++ b/packages/dds/matrix/src/serialization.ts @@ -5,10 +5,12 @@ import { bufferToString } from "@fluid-internal/client-utils"; import { IFluidHandle } from "@fluidframework/core-interfaces"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; -import { Serializable } from "@fluidframework/datastore-definitions/internal"; +import { + IChannelStorageService, + Serializable, +} from "@fluidframework/datastore-definitions/internal"; import { BlobTreeEntry } from "@fluidframework/driver-utils/internal"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; +import { IFluidSerializer } from "@fluidframework/shared-object-base/internal"; export const serializeBlob = ( handle: IFluidHandle, diff --git a/packages/dds/matrix/src/test/matrix.big.spec.ts b/packages/dds/matrix/src/test/matrix.big.spec.ts index 87abcda73628..e537376ccce8 100644 --- a/packages/dds/matrix/src/test/matrix.big.spec.ts +++ b/packages/dds/matrix/src/test/matrix.big.spec.ts @@ -4,7 +4,7 @@ */ import { AttachState } from "@fluidframework/container-definitions"; -import { IChannelServices } from "@fluidframework/datastore-definitions"; +import { IChannelServices } from "@fluidframework/datastore-definitions/internal"; import { MockContainerRuntimeFactory, MockEmptyDeltaConnection, diff --git a/packages/dds/matrix/src/test/matrix.spec.ts b/packages/dds/matrix/src/test/matrix.spec.ts index c715c8c4a44a..efc4cd371066 100644 --- a/packages/dds/matrix/src/test/matrix.spec.ts +++ b/packages/dds/matrix/src/test/matrix.spec.ts @@ -8,7 +8,7 @@ import { strict as assert } from "assert"; import { IGCTestProvider, runGCTests } from "@fluid-private/test-dds-utils"; import { AttachState } from "@fluidframework/container-definitions"; import type { IFluidHandleInternal } from "@fluidframework/core-interfaces/internal"; -import { IChannelServices } from "@fluidframework/datastore-definitions"; +import { IChannelServices } from "@fluidframework/datastore-definitions/internal"; import { MockContainerRuntimeFactory, MockContainerRuntimeFactoryForReconnection, diff --git a/packages/dds/matrix/src/test/matrix.stress.spec.ts b/packages/dds/matrix/src/test/matrix.stress.spec.ts index d8dcefc5fd35..000b2c18cf8a 100644 --- a/packages/dds/matrix/src/test/matrix.stress.spec.ts +++ b/packages/dds/matrix/src/test/matrix.stress.spec.ts @@ -5,7 +5,7 @@ import { strict as assert } from "assert"; -import { IChannelServices } from "@fluidframework/datastore-definitions"; +import { IChannelServices } from "@fluidframework/datastore-definitions/internal"; import { MockContainerRuntimeFactoryForReconnection, MockContainerRuntimeForReconnection, diff --git a/packages/dds/merge-tree/api-report/merge-tree.api.md b/packages/dds/merge-tree/api-report/merge-tree.api.md index bac109d58cd1..2fb54ad1d14c 100644 --- a/packages/dds/merge-tree/api-report/merge-tree.api.md +++ b/packages/dds/merge-tree/api-report/merge-tree.api.md @@ -5,11 +5,11 @@ ```ts import { AttributionKey } from '@fluidframework/runtime-definitions/internal'; -import { IChannelStorageService } from '@fluidframework/datastore-definitions'; +import { IChannelStorageService } from '@fluidframework/datastore-definitions/internal'; import { IEventThisPlaceHolder } from '@fluidframework/core-interfaces'; import { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions/internal'; import { IFluidHandle } from '@fluidframework/core-interfaces'; -import { IFluidSerializer } from '@fluidframework/shared-object-base'; +import { IFluidSerializer } from '@fluidframework/shared-object-base/internal'; import { ISequencedDocumentMessage } from '@fluidframework/protocol-definitions'; import { ISummaryTreeWithStats } from '@fluidframework/runtime-definitions/internal'; import { ITelemetryLoggerExt } from '@fluidframework/telemetry-utils/internal'; diff --git a/packages/dds/merge-tree/src/client.ts b/packages/dds/merge-tree/src/client.ts index 6e7f54637560..d689a8d05166 100644 --- a/packages/dds/merge-tree/src/client.ts +++ b/packages/dds/merge-tree/src/client.ts @@ -8,11 +8,13 @@ import { TypedEventEmitter } from "@fluid-internal/client-utils"; import { type IEventThisPlaceHolder, IFluidHandle } from "@fluidframework/core-interfaces"; import { assert, unreachableCase } from "@fluidframework/core-utils/internal"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; -import { IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions/internal"; +import { + IFluidDataStoreRuntime, + IChannelStorageService, +} from "@fluidframework/datastore-definitions/internal"; import { ISequencedDocumentMessage, MessageType } from "@fluidframework/protocol-definitions"; import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/internal"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; +import { IFluidSerializer } from "@fluidframework/shared-object-base/internal"; import { ITelemetryLoggerExt, LoggingError, diff --git a/packages/dds/merge-tree/src/snapshotChunks.ts b/packages/dds/merge-tree/src/snapshotChunks.ts index c916a779b2f0..38d888d2becd 100644 --- a/packages/dds/merge-tree/src/snapshotChunks.ts +++ b/packages/dds/merge-tree/src/snapshotChunks.ts @@ -6,7 +6,7 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ import { IFluidHandle } from "@fluidframework/core-interfaces"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; +import { IFluidSerializer } from "@fluidframework/shared-object-base/internal"; import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal"; import { SerializedAttributionCollection } from "./attributionCollection.js"; diff --git a/packages/dds/merge-tree/src/snapshotLoader.ts b/packages/dds/merge-tree/src/snapshotLoader.ts index 8ac11ffa1bcd..ffdfdc74bc3d 100644 --- a/packages/dds/merge-tree/src/snapshotLoader.ts +++ b/packages/dds/merge-tree/src/snapshotLoader.ts @@ -8,10 +8,12 @@ import { bufferToString } from "@fluid-internal/client-utils"; import { AttachState } from "@fluidframework/container-definitions"; import { assert } from "@fluidframework/core-utils/internal"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; -import { IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions/internal"; +import { + IFluidDataStoreRuntime, + IChannelStorageService, +} from "@fluidframework/datastore-definitions/internal"; import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; +import { IFluidSerializer } from "@fluidframework/shared-object-base/internal"; import { ITelemetryLoggerExt, UsageError, diff --git a/packages/dds/merge-tree/src/snapshotV1.ts b/packages/dds/merge-tree/src/snapshotV1.ts index 2b8612793a0e..b1bf23009b5a 100644 --- a/packages/dds/merge-tree/src/snapshotV1.ts +++ b/packages/dds/merge-tree/src/snapshotV1.ts @@ -6,13 +6,13 @@ import { bufferToString } from "@fluid-internal/client-utils"; import { IFluidHandle } from "@fluidframework/core-interfaces"; import { assert } from "@fluidframework/core-utils/internal"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; +import { IChannelStorageService } from "@fluidframework/datastore-definitions/internal"; import { ISummaryTreeWithStats, AttributionKey, } from "@fluidframework/runtime-definitions/internal"; import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; +import { IFluidSerializer } from "@fluidframework/shared-object-base/internal"; import { ITelemetryLoggerExt, createChildLogger } from "@fluidframework/telemetry-utils/internal"; import { IAttributionCollection } from "./attributionCollection.js"; diff --git a/packages/dds/merge-tree/src/snapshotlegacy.ts b/packages/dds/merge-tree/src/snapshotlegacy.ts index 6ef80507c593..a7bf014f70f1 100644 --- a/packages/dds/merge-tree/src/snapshotlegacy.ts +++ b/packages/dds/merge-tree/src/snapshotlegacy.ts @@ -10,7 +10,7 @@ import { assert } from "@fluidframework/core-utils/internal"; import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"; import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/internal"; import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; +import { IFluidSerializer } from "@fluidframework/shared-object-base/internal"; import { ITelemetryLoggerExt, createChildLogger } from "@fluidframework/telemetry-utils/internal"; import { NonCollabClient, UnassignedSequenceNumber } from "./constants.js"; diff --git a/packages/dds/merge-tree/src/test/testSerializer.ts b/packages/dds/merge-tree/src/test/testSerializer.ts index 0221676054d2..62398418c95f 100644 --- a/packages/dds/merge-tree/src/test/testSerializer.ts +++ b/packages/dds/merge-tree/src/test/testSerializer.ts @@ -5,7 +5,7 @@ import { IFluidHandle } from "@fluidframework/core-interfaces"; import { assert } from "@fluidframework/core-utils/internal"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; +import { IFluidSerializer } from "@fluidframework/shared-object-base/internal"; /** * Test serializer implementation for merge tree tests diff --git a/packages/dds/ordered-collection/api-report/ordered-collection.api.md b/packages/dds/ordered-collection/api-report/ordered-collection.api.md index cefbb13488ed..08f37bb81335 100644 --- a/packages/dds/ordered-collection/api-report/ordered-collection.api.md +++ b/packages/dds/ordered-collection/api-report/ordered-collection.api.md @@ -6,13 +6,13 @@ import { IChannelAttributes } from '@fluidframework/datastore-definitions/internal'; import { IChannelFactory } from '@fluidframework/datastore-definitions/internal'; -import { IChannelServices } from '@fluidframework/datastore-definitions'; -import { IChannelStorageService } from '@fluidframework/datastore-definitions'; +import { IChannelServices } from '@fluidframework/datastore-definitions/internal'; +import { IChannelStorageService } from '@fluidframework/datastore-definitions/internal'; import { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions/internal'; -import { IFluidSerializer } from '@fluidframework/shared-object-base'; +import { IFluidSerializer } from '@fluidframework/shared-object-base/internal'; import { ISequencedDocumentMessage } from '@fluidframework/protocol-definitions'; import { ISharedObject } from '@fluidframework/shared-object-base/internal'; -import { ISharedObjectEvents } from '@fluidframework/shared-object-base'; +import { ISharedObjectEvents } from '@fluidframework/shared-object-base/internal'; import { ISharedObjectKind } from '@fluidframework/shared-object-base/internal'; import { ISummaryTreeWithStats } from '@fluidframework/runtime-definitions/internal'; import { SharedObject } from '@fluidframework/shared-object-base/internal'; diff --git a/packages/dds/ordered-collection/src/consensusOrderedCollection.ts b/packages/dds/ordered-collection/src/consensusOrderedCollection.ts index c19f7d5f8b9d..14cf389b25e2 100644 --- a/packages/dds/ordered-collection/src/consensusOrderedCollection.ts +++ b/packages/dds/ordered-collection/src/consensusOrderedCollection.ts @@ -5,16 +5,15 @@ import { bufferToString } from "@fluid-internal/client-utils"; import { assert, unreachableCase } from "@fluidframework/core-utils/internal"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IFluidDataStoreRuntime, + IChannelStorageService, } from "@fluidframework/datastore-definitions/internal"; import { ISequencedDocumentMessage, MessageType } from "@fluidframework/protocol-definitions"; import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/internal"; import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; -import { SharedObject } from "@fluidframework/shared-object-base/internal"; +import { IFluidSerializer, SharedObject } from "@fluidframework/shared-object-base/internal"; import { v4 as uuid } from "uuid"; import { diff --git a/packages/dds/ordered-collection/src/consensusOrderedCollectionFactory.ts b/packages/dds/ordered-collection/src/consensusOrderedCollectionFactory.ts index 8d9f73b0fe8b..b5c0eec80044 100644 --- a/packages/dds/ordered-collection/src/consensusOrderedCollectionFactory.ts +++ b/packages/dds/ordered-collection/src/consensusOrderedCollectionFactory.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. */ -import { IChannelServices } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IFluidDataStoreRuntime, + IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { createSharedObjectKind } from "@fluidframework/shared-object-base/internal"; diff --git a/packages/dds/ordered-collection/src/interfaces.ts b/packages/dds/ordered-collection/src/interfaces.ts index f83c9b208c2a..f0a3fe473f61 100644 --- a/packages/dds/ordered-collection/src/interfaces.ts +++ b/packages/dds/ordered-collection/src/interfaces.ts @@ -3,14 +3,13 @@ * Licensed under the MIT License. */ -import { IChannelServices } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, } from "@fluidframework/datastore-definitions/internal"; -import { ISharedObjectEvents } from "@fluidframework/shared-object-base"; -import { ISharedObject } from "@fluidframework/shared-object-base/internal"; +import { ISharedObject, ISharedObjectEvents } from "@fluidframework/shared-object-base/internal"; /** * @alpha diff --git a/packages/dds/ordered-collection/src/test/consensusOrderedCollection.spec.ts b/packages/dds/ordered-collection/src/test/consensusOrderedCollection.spec.ts index 4785bb555187..f302e8478cf4 100644 --- a/packages/dds/ordered-collection/src/test/consensusOrderedCollection.spec.ts +++ b/packages/dds/ordered-collection/src/test/consensusOrderedCollection.spec.ts @@ -7,7 +7,7 @@ import { strict as assert } from "assert"; import { IGCTestProvider, runGCTests } from "@fluid-private/test-dds-utils"; import type { IFluidHandleInternal } from "@fluidframework/core-interfaces/internal"; -import { IChannelServices } from "@fluidframework/datastore-definitions"; +import { IChannelServices } from "@fluidframework/datastore-definitions/internal"; import { MockContainerRuntimeFactory, MockContainerRuntimeFactoryForReconnection, diff --git a/packages/dds/pact-map/api-report/pact-map.api.md b/packages/dds/pact-map/api-report/pact-map.api.md index daf6794ddb1c..65687ff20f0f 100644 --- a/packages/dds/pact-map/api-report/pact-map.api.md +++ b/packages/dds/pact-map/api-report/pact-map.api.md @@ -5,7 +5,7 @@ ```ts import { ISharedObject } from '@fluidframework/shared-object-base/internal'; -import { ISharedObjectEvents } from '@fluidframework/shared-object-base'; +import { ISharedObjectEvents } from '@fluidframework/shared-object-base/internal'; import { ISharedObjectKind } from '@fluidframework/shared-object-base/internal'; import { SharedObjectKind } from '@fluidframework/shared-object-base/internal'; diff --git a/packages/dds/pact-map/src/interfaces.ts b/packages/dds/pact-map/src/interfaces.ts index fa9b66598d6e..001c8393dc04 100644 --- a/packages/dds/pact-map/src/interfaces.ts +++ b/packages/dds/pact-map/src/interfaces.ts @@ -3,8 +3,10 @@ * Licensed under the MIT License. */ -import { type ISharedObjectEvents } from "@fluidframework/shared-object-base"; -import { type ISharedObject } from "@fluidframework/shared-object-base/internal"; +import { + type ISharedObject, + type ISharedObjectEvents, +} from "@fluidframework/shared-object-base/internal"; /** * Events emitted by {@link IPactMap}. diff --git a/packages/dds/pact-map/src/pactMap.ts b/packages/dds/pact-map/src/pactMap.ts index ef990ddfddd2..837c360b658d 100644 --- a/packages/dds/pact-map/src/pactMap.ts +++ b/packages/dds/pact-map/src/pactMap.ts @@ -5,15 +5,15 @@ import { EventEmitter } from "@fluid-internal/client-utils"; import { assert } from "@fluidframework/core-utils/internal"; -import { type IChannelStorageService } from "@fluidframework/datastore-definitions"; import { type IChannelAttributes, type IFluidDataStoreRuntime, + type IChannelStorageService, } from "@fluidframework/datastore-definitions/internal"; import { readAndParse } from "@fluidframework/driver-utils/internal"; import { type ISequencedDocumentMessage, MessageType } from "@fluidframework/protocol-definitions"; import { type ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/internal"; -import { type IFluidSerializer } from "@fluidframework/shared-object-base"; +import { type IFluidSerializer } from "@fluidframework/shared-object-base/internal"; import { SharedObject, createSingleBlobSummary } from "@fluidframework/shared-object-base/internal"; import { type IAcceptedPact, type IPactMap, type IPactMapEvents } from "./interfaces.js"; diff --git a/packages/dds/pact-map/src/pactMapFactory.ts b/packages/dds/pact-map/src/pactMapFactory.ts index f9a1e4d06172..c9adadcdbcbb 100644 --- a/packages/dds/pact-map/src/pactMapFactory.ts +++ b/packages/dds/pact-map/src/pactMapFactory.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. */ -import { type IChannelServices } from "@fluidframework/datastore-definitions"; import { type IChannelAttributes, type IChannelFactory, type IFluidDataStoreRuntime, + type IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { createSharedObjectKind } from "@fluidframework/shared-object-base/internal"; diff --git a/packages/dds/register-collection/api-report/register-collection.api.md b/packages/dds/register-collection/api-report/register-collection.api.md index 7ac6ddeb5b59..1bdd88b46479 100644 --- a/packages/dds/register-collection/api-report/register-collection.api.md +++ b/packages/dds/register-collection/api-report/register-collection.api.md @@ -6,13 +6,13 @@ import { IChannelAttributes } from '@fluidframework/datastore-definitions/internal'; import { IChannelFactory } from '@fluidframework/datastore-definitions/internal'; -import { IChannelServices } from '@fluidframework/datastore-definitions'; -import { IChannelStorageService } from '@fluidframework/datastore-definitions'; +import { IChannelServices } from '@fluidframework/datastore-definitions/internal'; +import { IChannelStorageService } from '@fluidframework/datastore-definitions/internal'; import { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions/internal'; -import { IFluidSerializer } from '@fluidframework/shared-object-base'; +import { IFluidSerializer } from '@fluidframework/shared-object-base/internal'; import { ISequencedDocumentMessage } from '@fluidframework/protocol-definitions'; import { ISharedObject } from '@fluidframework/shared-object-base/internal'; -import { ISharedObjectEvents } from '@fluidframework/shared-object-base'; +import { ISharedObjectEvents } from '@fluidframework/shared-object-base/internal'; import { ISharedObjectKind } from '@fluidframework/shared-object-base/internal'; import { ISummaryTreeWithStats } from '@fluidframework/runtime-definitions/internal'; import { SharedObject } from '@fluidframework/shared-object-base/internal'; diff --git a/packages/dds/register-collection/src/consensusRegisterCollection.ts b/packages/dds/register-collection/src/consensusRegisterCollection.ts index 59498d679d1d..967ff099e242 100644 --- a/packages/dds/register-collection/src/consensusRegisterCollection.ts +++ b/packages/dds/register-collection/src/consensusRegisterCollection.ts @@ -5,15 +5,18 @@ import { bufferToString } from "@fluid-internal/client-utils"; import { assert, unreachableCase } from "@fluidframework/core-utils/internal"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IFluidDataStoreRuntime, + IChannelStorageService, } from "@fluidframework/datastore-definitions/internal"; import { ISequencedDocumentMessage, MessageType } from "@fluidframework/protocol-definitions"; import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/internal"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; -import { SharedObject, createSingleBlobSummary } from "@fluidframework/shared-object-base/internal"; +import { + IFluidSerializer, + SharedObject, + createSingleBlobSummary, +} from "@fluidframework/shared-object-base/internal"; import { IConsensusRegisterCollection, diff --git a/packages/dds/register-collection/src/consensusRegisterCollectionFactory.ts b/packages/dds/register-collection/src/consensusRegisterCollectionFactory.ts index 7bf703be19f1..0f500a4981ee 100644 --- a/packages/dds/register-collection/src/consensusRegisterCollectionFactory.ts +++ b/packages/dds/register-collection/src/consensusRegisterCollectionFactory.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. */ -import { IChannelServices } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IFluidDataStoreRuntime, type IChannelFactory, + IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { createSharedObjectKind } from "@fluidframework/shared-object-base/internal"; diff --git a/packages/dds/register-collection/src/interfaces.ts b/packages/dds/register-collection/src/interfaces.ts index 0327093694e6..5e29cf9255e8 100644 --- a/packages/dds/register-collection/src/interfaces.ts +++ b/packages/dds/register-collection/src/interfaces.ts @@ -4,8 +4,7 @@ */ import { IChannelFactory } from "@fluidframework/datastore-definitions/internal"; -import { ISharedObjectEvents } from "@fluidframework/shared-object-base"; -import { ISharedObject } from "@fluidframework/shared-object-base/internal"; +import { ISharedObject, ISharedObjectEvents } from "@fluidframework/shared-object-base/internal"; /** * Consensus Register Collection channel factory interface diff --git a/packages/dds/sequence/api-report/sequence.api.md b/packages/dds/sequence/api-report/sequence.api.md index 0327e6835c2c..596b4b20f11e 100644 --- a/packages/dds/sequence/api-report/sequence.api.md +++ b/packages/dds/sequence/api-report/sequence.api.md @@ -8,12 +8,12 @@ import { BaseSegment } from '@fluidframework/merge-tree/internal'; import { Client } from '@fluidframework/merge-tree/internal'; import { IChannelAttributes } from '@fluidframework/datastore-definitions/internal'; import { IChannelFactory } from '@fluidframework/datastore-definitions/internal'; -import { IChannelServices } from '@fluidframework/datastore-definitions'; -import { IChannelStorageService } from '@fluidframework/datastore-definitions'; +import { IChannelServices } from '@fluidframework/datastore-definitions/internal'; +import { IChannelStorageService } from '@fluidframework/datastore-definitions/internal'; import { IEvent } from '@fluidframework/core-interfaces'; import { IEventThisPlaceHolder } from '@fluidframework/core-interfaces'; import { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions/internal'; -import { IFluidSerializer } from '@fluidframework/shared-object-base'; +import { IFluidSerializer } from '@fluidframework/shared-object-base/internal'; import { IJSONSegment } from '@fluidframework/merge-tree/internal'; import { IMergeTreeDeltaCallbackArgs } from '@fluidframework/merge-tree/internal'; import { IMergeTreeDeltaOpArgs } from '@fluidframework/merge-tree/internal'; @@ -24,7 +24,7 @@ import { ISegment } from '@fluidframework/merge-tree/internal'; import { ISegmentAction } from '@fluidframework/merge-tree/internal'; import { ISequencedDocumentMessage } from '@fluidframework/protocol-definitions'; import { ISharedObject } from '@fluidframework/shared-object-base/internal'; -import { ISharedObjectEvents } from '@fluidframework/shared-object-base'; +import { ISharedObjectEvents } from '@fluidframework/shared-object-base/internal'; import { ISharedObjectKind } from '@fluidframework/shared-object-base/internal'; import { ISummaryTreeWithStats } from '@fluidframework/runtime-definitions/internal'; import { ITelemetryContext } from '@fluidframework/runtime-definitions/internal'; diff --git a/packages/dds/sequence/src/IntervalCollectionValues.ts b/packages/dds/sequence/src/IntervalCollectionValues.ts index 0ad798c06aa3..41ca2cd5b2d6 100644 --- a/packages/dds/sequence/src/IntervalCollectionValues.ts +++ b/packages/dds/sequence/src/IntervalCollectionValues.ts @@ -4,8 +4,7 @@ */ import { IFluidHandle } from "@fluidframework/core-interfaces"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; -import { serializeHandles } from "@fluidframework/shared-object-base/internal"; +import { serializeHandles, IFluidSerializer } from "@fluidframework/shared-object-base/internal"; import type { IntervalCollection } from "./intervalCollection.js"; import { diff --git a/packages/dds/sequence/src/intervalCollectionMap.ts b/packages/dds/sequence/src/intervalCollectionMap.ts index 14ce91525739..1be56fe2077a 100644 --- a/packages/dds/sequence/src/intervalCollectionMap.ts +++ b/packages/dds/sequence/src/intervalCollectionMap.ts @@ -7,8 +7,7 @@ import { TypedEventEmitter } from "@fluid-internal/client-utils"; import { IFluidHandle } from "@fluidframework/core-interfaces"; import { assert } from "@fluidframework/core-utils/internal"; import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; -import { ValueType } from "@fluidframework/shared-object-base/internal"; +import { ValueType, IFluidSerializer } from "@fluidframework/shared-object-base/internal"; import { IntervalCollectionTypeLocalValue, makeSerializable } from "./IntervalCollectionValues.js"; import { diff --git a/packages/dds/sequence/src/intervalCollectionMapInterfaces.ts b/packages/dds/sequence/src/intervalCollectionMapInterfaces.ts index dd05ca4f4582..592585794aa1 100644 --- a/packages/dds/sequence/src/intervalCollectionMapInterfaces.ts +++ b/packages/dds/sequence/src/intervalCollectionMapInterfaces.ts @@ -5,7 +5,7 @@ import { IEventThisPlaceHolder } from "@fluidframework/core-interfaces"; import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"; -import { ISharedObjectEvents } from "@fluidframework/shared-object-base"; +import { ISharedObjectEvents } from "@fluidframework/shared-object-base/internal"; import type { IntervalCollection } from "./intervalCollection.js"; import { diff --git a/packages/dds/sequence/src/intervalIndex/overlappingSequenceIntervalsIndex.ts b/packages/dds/sequence/src/intervalIndex/overlappingSequenceIntervalsIndex.ts index b450a7a1cabb..c550dbfb0096 100644 --- a/packages/dds/sequence/src/intervalIndex/overlappingSequenceIntervalsIndex.ts +++ b/packages/dds/sequence/src/intervalIndex/overlappingSequenceIntervalsIndex.ts @@ -24,9 +24,6 @@ import { ISharedString } from "../sharedString.js"; import { OverlappingIntervalsIndex } from "./overlappingIntervalsIndex.js"; import { SequenceIntervalIndexes } from "./sequenceIntervalIndexes.js"; -/** - * @public - */ class OverlappingSequenceIntervalsIndex extends OverlappingIntervalsIndex implements SequenceIntervalIndexes.Overlapping diff --git a/packages/dds/sequence/src/sequence.ts b/packages/dds/sequence/src/sequence.ts index babb1d807599..e7f5cc1f6cba 100644 --- a/packages/dds/sequence/src/sequence.ts +++ b/packages/dds/sequence/src/sequence.ts @@ -6,10 +6,10 @@ import { bufferToString } from "@fluid-internal/client-utils"; import { IEventThisPlaceHolder } from "@fluidframework/core-interfaces"; import { assert } from "@fluidframework/core-utils/internal"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IFluidDataStoreRuntime, + IChannelStorageService, } from "@fluidframework/datastore-definitions/internal"; import { // eslint-disable-next-line import/no-deprecated @@ -49,8 +49,12 @@ import { ITelemetryContext, } from "@fluidframework/runtime-definitions/internal"; import { ObjectStoragePartition, SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal"; -import { IFluidSerializer, ISharedObjectEvents } from "@fluidframework/shared-object-base"; -import { SharedObject, type ISharedObject } from "@fluidframework/shared-object-base/internal"; +import { + IFluidSerializer, + ISharedObjectEvents, + SharedObject, + type ISharedObject, +} from "@fluidframework/shared-object-base/internal"; import { LoggingError, createChildLogger } from "@fluidframework/telemetry-utils/internal"; import Deque from "double-ended-queue"; diff --git a/packages/dds/sequence/src/sequenceFactory.ts b/packages/dds/sequence/src/sequenceFactory.ts index 2a0d8fe621b7..f4ed135116d8 100644 --- a/packages/dds/sequence/src/sequenceFactory.ts +++ b/packages/dds/sequence/src/sequenceFactory.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. */ -import { IChannelServices } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { Marker, TextSegment } from "@fluidframework/merge-tree/internal"; import { createSharedObjectKind } from "@fluidframework/shared-object-base/internal"; diff --git a/packages/dds/sequence/src/sharedIntervalCollection.ts b/packages/dds/sequence/src/sharedIntervalCollection.ts index 02b4346e11cb..880ae7a8496b 100644 --- a/packages/dds/sequence/src/sharedIntervalCollection.ts +++ b/packages/dds/sequence/src/sharedIntervalCollection.ts @@ -4,16 +4,20 @@ */ import { bufferToString } from "@fluid-internal/client-utils"; -import { IChannelServices, IChannelStorageService } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, + IChannelStorageService, } from "@fluidframework/datastore-definitions/internal"; import { ISequencedDocumentMessage, MessageType } from "@fluidframework/protocol-definitions"; import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/internal"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; -import { SharedObject, createSingleBlobSummary } from "@fluidframework/shared-object-base/internal"; +import { + IFluidSerializer, + SharedObject, + createSingleBlobSummary, +} from "@fluidframework/shared-object-base/internal"; import { IIntervalCollection, IntervalCollectionValueType } from "./intervalCollection.js"; import { IMapOperation, IntervalCollectionMap } from "./intervalCollectionMap.js"; diff --git a/packages/dds/sequence/src/test/fuzz/fuzzUtils.ts b/packages/dds/sequence/src/test/fuzz/fuzzUtils.ts index 3f20c416e71d..8fc3329497c4 100644 --- a/packages/dds/sequence/src/test/fuzz/fuzzUtils.ts +++ b/packages/dds/sequence/src/test/fuzz/fuzzUtils.ts @@ -14,11 +14,11 @@ import { createWeightedAsyncGenerator, } from "@fluid-private/stochastic-test-utils"; import { DDSFuzzModel, DDSFuzzSuiteOptions, DDSFuzzTestState } from "@fluid-private/test-dds-utils"; -import { IChannelServices } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IFluidDataStoreRuntime, type Serializable, + IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { PropertySet } from "@fluidframework/merge-tree/internal"; diff --git a/packages/dds/sequence/src/test/intervalCollection.spec.ts b/packages/dds/sequence/src/test/intervalCollection.spec.ts index a3de2fed5dc3..6bcd52a93b62 100644 --- a/packages/dds/sequence/src/test/intervalCollection.spec.ts +++ b/packages/dds/sequence/src/test/intervalCollection.spec.ts @@ -6,7 +6,7 @@ import { strict as assert } from "assert"; import { AttachState } from "@fluidframework/container-definitions"; -import { IChannelServices } from "@fluidframework/datastore-definitions"; +import { IChannelServices } from "@fluidframework/datastore-definitions/internal"; import { ReferenceType, SlidingPreference, diff --git a/packages/dds/sequence/src/test/intervalRebasing.spec.ts b/packages/dds/sequence/src/test/intervalRebasing.spec.ts index 616fbe61fae4..3a06fb7181cd 100644 --- a/packages/dds/sequence/src/test/intervalRebasing.spec.ts +++ b/packages/dds/sequence/src/test/intervalRebasing.spec.ts @@ -5,7 +5,7 @@ import { strict as assert } from "assert"; -import { IChannelServices } from "@fluidframework/datastore-definitions"; +import { IChannelServices } from "@fluidframework/datastore-definitions/internal"; import { useStrictPartialLengthChecks } from "@fluidframework/merge-tree/internal/test"; import { MockContainerRuntimeFactoryForReconnection, diff --git a/packages/dds/sequence/src/test/sharedString.spec.ts b/packages/dds/sequence/src/test/sharedString.spec.ts index fb42dce93e46..aabba7c6bf60 100644 --- a/packages/dds/sequence/src/test/sharedString.spec.ts +++ b/packages/dds/sequence/src/test/sharedString.spec.ts @@ -6,7 +6,7 @@ import { strict as assert } from "assert"; import { AttachState } from "@fluidframework/container-definitions"; -import { IChannelServices } from "@fluidframework/datastore-definitions"; +import { IChannelServices } from "@fluidframework/datastore-definitions/internal"; import { Marker, MergeTreeDeltaRevertible, diff --git a/packages/dds/sequence/src/test/summaryLoad.spec.ts b/packages/dds/sequence/src/test/summaryLoad.spec.ts index 69ffe3802365..39115af48856 100644 --- a/packages/dds/sequence/src/test/summaryLoad.spec.ts +++ b/packages/dds/sequence/src/test/summaryLoad.spec.ts @@ -5,7 +5,7 @@ import { strict as assert } from "assert"; -import { IChannelServices } from "@fluidframework/datastore-definitions"; +import { IChannelServices } from "@fluidframework/datastore-definitions/internal"; import { ReferenceType } from "@fluidframework/merge-tree/internal"; import { ISummaryTree } from "@fluidframework/protocol-definitions"; import { diff --git a/packages/dds/sequence/src/test/v1IntervalCollectionHelpers.ts b/packages/dds/sequence/src/test/v1IntervalCollectionHelpers.ts index 2083156b8534..89861267764d 100644 --- a/packages/dds/sequence/src/test/v1IntervalCollectionHelpers.ts +++ b/packages/dds/sequence/src/test/v1IntervalCollectionHelpers.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. */ -import { IChannelServices } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { Client } from "@fluidframework/merge-tree/internal"; diff --git a/packages/dds/shared-object-base/api-report/shared-object-base.api.md b/packages/dds/shared-object-base/api-report/shared-object-base.api.md index 70c518695d6f..abbc725e351a 100644 --- a/packages/dds/shared-object-base/api-report/shared-object-base.api.md +++ b/packages/dds/shared-object-base/api-report/shared-object-base.api.md @@ -10,8 +10,8 @@ import { EventEmitterWithErrorHandling } from '@fluidframework/telemetry-utils/i import { IChannel } from '@fluidframework/datastore-definitions/internal'; import { IChannelAttributes } from '@fluidframework/datastore-definitions/internal'; import { IChannelFactory } from '@fluidframework/datastore-definitions/internal'; -import { IChannelServices } from '@fluidframework/datastore-definitions'; -import { IChannelStorageService } from '@fluidframework/datastore-definitions'; +import { IChannelServices } from '@fluidframework/datastore-definitions/internal'; +import { IChannelStorageService } from '@fluidframework/datastore-definitions/internal'; import type { IDeltaManager } from '@fluidframework/container-definitions/internal'; import { IDocumentMessage } from '@fluidframework/protocol-definitions'; import { IErrorEvent } from '@fluidframework/core-interfaces'; @@ -57,7 +57,7 @@ export class FluidSerializer implements IFluidSerializer { stringify(input: unknown, bind: IFluidHandle): string; } -// @public (undocumented) +// @alpha (undocumented) export interface IFluidSerializer { decode(input: any): any; encode(value: any, bind: IFluidHandle): any; @@ -71,7 +71,7 @@ export interface ISharedObject void): any; diff --git a/packages/dds/shared-object-base/src/serializer.ts b/packages/dds/shared-object-base/src/serializer.ts index cb6d86ed0c06..56f8d0120244 100644 --- a/packages/dds/shared-object-base/src/serializer.ts +++ b/packages/dds/shared-object-base/src/serializer.ts @@ -21,7 +21,7 @@ import { import { RemoteFluidObjectHandle } from "./remoteObjectHandle.js"; /** - * @public + * @alpha */ export interface IFluidSerializer { /** diff --git a/packages/dds/shared-object-base/src/sharedObject.ts b/packages/dds/shared-object-base/src/sharedObject.ts index 857fb0b96a6a..6e2353ffa846 100644 --- a/packages/dds/shared-object-base/src/sharedObject.ts +++ b/packages/dds/shared-object-base/src/sharedObject.ts @@ -12,7 +12,10 @@ import { } from "@fluidframework/core-interfaces"; import { type IFluidHandleInternal } from "@fluidframework/core-interfaces/internal"; import { assert } from "@fluidframework/core-utils/internal"; -import { IChannelServices, IChannelStorageService } from "@fluidframework/datastore-definitions"; +import { + IChannelServices, + IChannelStorageService, +} from "@fluidframework/datastore-definitions/internal"; import { IChannelAttributes, type IChannelFactory, diff --git a/packages/dds/shared-object-base/src/test/attachingBindingAndConnecting.spec.ts b/packages/dds/shared-object-base/src/test/attachingBindingAndConnecting.spec.ts index 6b8dce86eb25..2acfdb5866a2 100644 --- a/packages/dds/shared-object-base/src/test/attachingBindingAndConnecting.spec.ts +++ b/packages/dds/shared-object-base/src/test/attachingBindingAndConnecting.spec.ts @@ -8,15 +8,13 @@ import { strict as assert } from "assert"; import { TypedEventEmitter } from "@fluid-internal/client-utils"; import { generatePairwiseOptions } from "@fluid-private/test-pairwise-generator"; import { AttachState } from "@fluidframework/container-definitions"; -import { - IChannelServices, - IChannelStorageService, - IDeltaConnection, -} from "@fluidframework/datastore-definitions"; import { type IChannelAttributes, type IFluidDataStoreRuntime, type IFluidDataStoreRuntimeEvents, + IChannelServices, + IChannelStorageService, + IDeltaConnection, } from "@fluidframework/datastore-definitions/internal"; import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"; import { diff --git a/packages/dds/shared-object-base/src/test/sharedObject.spec.ts b/packages/dds/shared-object-base/src/test/sharedObject.spec.ts index 605abd4a8fa1..fff516d38398 100644 --- a/packages/dds/shared-object-base/src/test/sharedObject.spec.ts +++ b/packages/dds/shared-object-base/src/test/sharedObject.spec.ts @@ -4,10 +4,10 @@ */ import { strict as assert } from "assert"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IFluidDataStoreRuntime, + IChannelStorageService, } from "@fluidframework/datastore-definitions/internal"; import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"; import { diff --git a/packages/dds/shared-object-base/src/types.ts b/packages/dds/shared-object-base/src/types.ts index 345358cb9730..2f553cd83960 100644 --- a/packages/dds/shared-object-base/src/types.ts +++ b/packages/dds/shared-object-base/src/types.ts @@ -14,7 +14,7 @@ import { IGarbageCollectionData } from "@fluidframework/runtime-definitions/inte /** * Events emitted by {@link ISharedObject}. - * @public + * @alpha */ export interface ISharedObjectEvents extends IErrorEvent { /** diff --git a/packages/dds/shared-summary-block/src/sharedSummaryBlock.ts b/packages/dds/shared-summary-block/src/sharedSummaryBlock.ts index f4ce20fbc31b..b64034ae256b 100644 --- a/packages/dds/shared-summary-block/src/sharedSummaryBlock.ts +++ b/packages/dds/shared-summary-block/src/sharedSummaryBlock.ts @@ -3,17 +3,20 @@ * Licensed under the MIT License. */ -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; import { Jsonable, IChannelAttributes, IFluidDataStoreRuntime, + IChannelStorageService, } from "@fluidframework/datastore-definitions/internal"; import { readAndParse } from "@fluidframework/driver-utils/internal"; import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"; import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/internal"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; -import { SharedObject, createSingleBlobSummary } from "@fluidframework/shared-object-base/internal"; +import { + IFluidSerializer, + SharedObject, + createSingleBlobSummary, +} from "@fluidframework/shared-object-base/internal"; import { ISharedSummaryBlock } from "./interfaces.js"; diff --git a/packages/dds/shared-summary-block/src/sharedSummaryBlockFactory.ts b/packages/dds/shared-summary-block/src/sharedSummaryBlockFactory.ts index e2160fbd99e5..1b14eaa4a4bc 100644 --- a/packages/dds/shared-summary-block/src/sharedSummaryBlockFactory.ts +++ b/packages/dds/shared-summary-block/src/sharedSummaryBlockFactory.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. */ -import { IChannelServices } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { createSharedObjectKind } from "@fluidframework/shared-object-base/internal"; diff --git a/packages/dds/task-manager/api-report/task-manager.api.md b/packages/dds/task-manager/api-report/task-manager.api.md index dd2e0f84493e..e98f32947e51 100644 --- a/packages/dds/task-manager/api-report/task-manager.api.md +++ b/packages/dds/task-manager/api-report/task-manager.api.md @@ -5,7 +5,7 @@ ```ts import { ISharedObject } from '@fluidframework/shared-object-base/internal'; -import { ISharedObjectEvents } from '@fluidframework/shared-object-base'; +import { ISharedObjectEvents } from '@fluidframework/shared-object-base/internal'; import { ISharedObjectKind } from '@fluidframework/shared-object-base/internal'; import { SharedObjectKind } from '@fluidframework/shared-object-base/internal'; diff --git a/packages/dds/task-manager/src/interfaces.ts b/packages/dds/task-manager/src/interfaces.ts index 5b15f3456a20..31f5e8fc9560 100644 --- a/packages/dds/task-manager/src/interfaces.ts +++ b/packages/dds/task-manager/src/interfaces.ts @@ -3,8 +3,7 @@ * Licensed under the MIT License. */ -import { ISharedObjectEvents } from "@fluidframework/shared-object-base"; -import { ISharedObject } from "@fluidframework/shared-object-base/internal"; +import { ISharedObject, ISharedObjectEvents } from "@fluidframework/shared-object-base/internal"; /** * Describes the event listener format for {@link ITaskManagerEvents} events. diff --git a/packages/dds/task-manager/src/taskManager.ts b/packages/dds/task-manager/src/taskManager.ts index b6df62b517da..92cfdc4305ff 100644 --- a/packages/dds/task-manager/src/taskManager.ts +++ b/packages/dds/task-manager/src/taskManager.ts @@ -6,16 +6,19 @@ import { EventEmitter } from "@fluid-internal/client-utils"; import { ReadOnlyInfo } from "@fluidframework/container-definitions/internal"; import { assert, unreachableCase } from "@fluidframework/core-utils/internal"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IFluidDataStoreRuntime, + IChannelStorageService, } from "@fluidframework/datastore-definitions/internal"; import { readAndParse } from "@fluidframework/driver-utils/internal"; import { ISequencedDocumentMessage, MessageType } from "@fluidframework/protocol-definitions"; import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/internal"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; -import { SharedObject, createSingleBlobSummary } from "@fluidframework/shared-object-base/internal"; +import { + IFluidSerializer, + SharedObject, + createSingleBlobSummary, +} from "@fluidframework/shared-object-base/internal"; import { ITaskManager, ITaskManagerEvents } from "./interfaces.js"; diff --git a/packages/dds/task-manager/src/taskManagerFactory.ts b/packages/dds/task-manager/src/taskManagerFactory.ts index 45f7a61ccbe0..df36f0be70a0 100644 --- a/packages/dds/task-manager/src/taskManagerFactory.ts +++ b/packages/dds/task-manager/src/taskManagerFactory.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. */ -import { IChannelServices } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { createSharedObjectKind } from "@fluidframework/shared-object-base/internal"; diff --git a/packages/dds/test-dds-utils/src/ddsFuzzHarness.ts b/packages/dds/test-dds-utils/src/ddsFuzzHarness.ts index bc2a87795711..c8ee43dbc8cb 100644 --- a/packages/dds/test-dds-utils/src/ddsFuzzHarness.ts +++ b/packages/dds/test-dds-utils/src/ddsFuzzHarness.ts @@ -33,8 +33,10 @@ import { import { AttachState } from "@fluidframework/container-definitions"; import type { IFluidHandle } from "@fluidframework/core-interfaces"; import { unreachableCase } from "@fluidframework/core-utils/internal"; -import type { IChannelServices } from "@fluidframework/datastore-definitions"; -import type { IChannelFactory } from "@fluidframework/datastore-definitions/internal"; +import type { + IChannelFactory, + IChannelServices, +} from "@fluidframework/datastore-definitions/internal"; import type { IIdCompressor } from "@fluidframework/id-compressor"; import type { IIdCompressorCore } from "@fluidframework/id-compressor/internal"; import { diff --git a/packages/dds/test-dds-utils/src/test/sharedNothing.ts b/packages/dds/test-dds-utils/src/test/sharedNothing.ts index 942afcaee2ee..a134a3b36594 100644 --- a/packages/dds/test-dds-utils/src/test/sharedNothing.ts +++ b/packages/dds/test-dds-utils/src/test/sharedNothing.ts @@ -3,14 +3,12 @@ * Licensed under the MIT License. */ -import type { - IChannelServices, - IChannelStorageService, -} from "@fluidframework/datastore-definitions"; import type { IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, + IChannelStorageService, } from "@fluidframework/datastore-definitions/internal"; import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal"; import { SharedObject } from "@fluidframework/shared-object-base/internal"; diff --git a/packages/dds/tree/src/feature-libraries/detachedFieldIndexSummarizer.ts b/packages/dds/tree/src/feature-libraries/detachedFieldIndexSummarizer.ts index 23bb0d6408f0..72680ed3fd8c 100644 --- a/packages/dds/tree/src/feature-libraries/detachedFieldIndexSummarizer.ts +++ b/packages/dds/tree/src/feature-libraries/detachedFieldIndexSummarizer.ts @@ -4,7 +4,7 @@ */ import { bufferToString } from "@fluid-internal/client-utils"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; +import { IChannelStorageService } from "@fluidframework/datastore-definitions/internal"; import { IGarbageCollectionData, ISummaryTreeWithStats, diff --git a/packages/dds/tree/src/feature-libraries/forest-summary/forestSummarizer.ts b/packages/dds/tree/src/feature-libraries/forest-summary/forestSummarizer.ts index a22bc985d439..0f9c24519c18 100644 --- a/packages/dds/tree/src/feature-libraries/forest-summary/forestSummarizer.ts +++ b/packages/dds/tree/src/feature-libraries/forest-summary/forestSummarizer.ts @@ -5,7 +5,7 @@ import { bufferToString } from "@fluid-internal/client-utils"; import { assert } from "@fluidframework/core-utils/internal"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; +import { IChannelStorageService } from "@fluidframework/datastore-definitions/internal"; import { IGarbageCollectionData, ISummaryTreeWithStats, diff --git a/packages/dds/tree/src/feature-libraries/schema-index/schemaSummarizer.ts b/packages/dds/tree/src/feature-libraries/schema-index/schemaSummarizer.ts index fc6387bcc3ea..6b6d8e310949 100644 --- a/packages/dds/tree/src/feature-libraries/schema-index/schemaSummarizer.ts +++ b/packages/dds/tree/src/feature-libraries/schema-index/schemaSummarizer.ts @@ -5,8 +5,10 @@ import { bufferToString } from "@fluid-internal/client-utils"; import { assert } from "@fluidframework/core-utils/internal"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; -import { IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions/internal"; +import { + IFluidDataStoreRuntime, + IChannelStorageService, +} from "@fluidframework/datastore-definitions/internal"; import { SummaryType } from "@fluidframework/protocol-definitions"; import { IExperimentalIncrementalSummaryContext, diff --git a/packages/dds/tree/src/shared-tree-core/editManagerSummarizer.ts b/packages/dds/tree/src/shared-tree-core/editManagerSummarizer.ts index bb58b329f331..604c4c32cd17 100644 --- a/packages/dds/tree/src/shared-tree-core/editManagerSummarizer.ts +++ b/packages/dds/tree/src/shared-tree-core/editManagerSummarizer.ts @@ -5,7 +5,7 @@ import { bufferToString } from "@fluid-internal/client-utils"; import { assert } from "@fluidframework/core-utils/internal"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; +import { IChannelStorageService } from "@fluidframework/datastore-definitions/internal"; import { IGarbageCollectionData, ISummaryTreeWithStats, diff --git a/packages/dds/tree/src/shared-tree-core/sharedTreeCore.ts b/packages/dds/tree/src/shared-tree-core/sharedTreeCore.ts index bb70cde61320..94f4886c0533 100644 --- a/packages/dds/tree/src/shared-tree-core/sharedTreeCore.ts +++ b/packages/dds/tree/src/shared-tree-core/sharedTreeCore.ts @@ -4,10 +4,10 @@ */ import { assert } from "@fluidframework/core-utils/internal"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IFluidDataStoreRuntime, + IChannelStorageService, } from "@fluidframework/datastore-definitions/internal"; import { IIdCompressor } from "@fluidframework/id-compressor"; import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"; @@ -18,8 +18,7 @@ import { ITelemetryContext, } from "@fluidframework/runtime-definitions/internal"; import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; -import { SharedObject } from "@fluidframework/shared-object-base/internal"; +import { IFluidSerializer, SharedObject } from "@fluidframework/shared-object-base/internal"; import { ICodecOptions, IJsonCodec } from "../codec/index.js"; import { diff --git a/packages/dds/tree/src/shared-tree/sharedTree.ts b/packages/dds/tree/src/shared-tree/sharedTree.ts index 4ffcb744cf28..398fbc57142c 100644 --- a/packages/dds/tree/src/shared-tree/sharedTree.ts +++ b/packages/dds/tree/src/shared-tree/sharedTree.ts @@ -4,11 +4,12 @@ */ import { assert } from "@fluidframework/core-utils/internal"; -import { IChannelServices, IChannelStorageService } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, + IChannelStorageService, } from "@fluidframework/datastore-definitions/internal"; import { ISharedObject } from "@fluidframework/shared-object-base/internal"; import { UsageError } from "@fluidframework/telemetry-utils/internal"; diff --git a/packages/dds/tree/src/test/shared-tree-core/sharedTreeCore.spec.ts b/packages/dds/tree/src/test/shared-tree-core/sharedTreeCore.spec.ts index 8a201bbba2dd..31f4dc5d22f9 100644 --- a/packages/dds/tree/src/test/shared-tree-core/sharedTreeCore.spec.ts +++ b/packages/dds/tree/src/test/shared-tree-core/sharedTreeCore.spec.ts @@ -7,7 +7,7 @@ import { strict as assert } from "assert"; import { IsoBuffer, TypedEventEmitter } from "@fluid-internal/client-utils"; import { IEvent } from "@fluidframework/core-interfaces"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; +import { IChannelStorageService } from "@fluidframework/datastore-definitions/internal"; import { createIdCompressor } from "@fluidframework/id-compressor/internal"; import { ISummaryTree, SummaryObject, SummaryType } from "@fluidframework/protocol-definitions"; import { diff --git a/packages/dds/tree/src/test/shared-tree/summary.bench.ts b/packages/dds/tree/src/test/shared-tree/summary.bench.ts index 411df053db91..e724f1588abc 100644 --- a/packages/dds/tree/src/test/shared-tree/summary.bench.ts +++ b/packages/dds/tree/src/test/shared-tree/summary.bench.ts @@ -7,7 +7,7 @@ import { strict as assert } from "assert"; import { IsoBuffer } from "@fluid-internal/client-utils"; import { BenchmarkType, benchmark } from "@fluid-tools/benchmark"; -import { IChannelServices } from "@fluidframework/datastore-definitions"; +import { IChannelServices } from "@fluidframework/datastore-definitions/internal"; import { ISummaryTree, ITree } from "@fluidframework/protocol-definitions"; import { convertSummaryTreeToITree } from "@fluidframework/runtime-utils/internal"; import { diff --git a/packages/dds/tree/src/test/utils.ts b/packages/dds/tree/src/test/utils.ts index bcad4c677103..49bf07aa00a1 100644 --- a/packages/dds/tree/src/test/utils.ts +++ b/packages/dds/tree/src/test/utils.ts @@ -12,10 +12,10 @@ import { IContainer } from "@fluidframework/container-definitions/internal"; import { Loader } from "@fluidframework/container-loader/internal"; import { ISummarizer } from "@fluidframework/container-runtime/internal"; import { ConfigTypes, IConfigProviderBase } from "@fluidframework/core-interfaces"; -import { IChannelServices } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IFluidDataStoreRuntime, + IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { SessionId } from "@fluidframework/id-compressor"; import { createIdCompressor } from "@fluidframework/id-compressor/internal"; diff --git a/packages/dds/tree/src/treeFactory.ts b/packages/dds/tree/src/treeFactory.ts index bfc1ab5a41b3..b067166ae1ce 100644 --- a/packages/dds/tree/src/treeFactory.ts +++ b/packages/dds/tree/src/treeFactory.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. */ -import { IChannelServices } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { SharedObjectKind } from "@fluidframework/shared-object-base"; import { diff --git a/packages/framework/attributor/src/test/attribution/sharedString.attribution.spec.ts b/packages/framework/attributor/src/test/attribution/sharedString.attribution.spec.ts index 1359e3723749..54678de8714d 100644 --- a/packages/framework/attributor/src/test/attribution/sharedString.attribution.spec.ts +++ b/packages/framework/attributor/src/test/attribution/sharedString.attribution.spec.ts @@ -22,10 +22,10 @@ import { performFuzzActions, take, } from "@fluid-private/stochastic-test-utils"; -import { type IChannelServices } from "@fluidframework/datastore-definitions"; import { type Jsonable, type IFluidDataStoreRuntime, + type IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { createInsertOnlyAttributionPolicy } from "@fluidframework/merge-tree/internal"; import { diff --git a/packages/framework/fluid-framework/api-report/fluid-framework.api.md b/packages/framework/fluid-framework/api-report/fluid-framework.api.md index 820eede206e8..aab054d15220 100644 --- a/packages/framework/fluid-framework/api-report/fluid-framework.api.md +++ b/packages/framework/fluid-framework/api-report/fluid-framework.api.md @@ -11,8 +11,8 @@ import { EventEmitterWithErrorHandling } from '@fluidframework/telemetry-utils/i import { IChannel } from '@fluidframework/datastore-definitions/internal'; import { IChannelAttributes } from '@fluidframework/datastore-definitions/internal'; import type { IChannelFactory } from '@fluidframework/datastore-definitions/internal'; -import { IChannelServices } from '@fluidframework/datastore-definitions'; -import { IChannelStorageService } from '@fluidframework/datastore-definitions'; +import { IChannelServices } from '@fluidframework/datastore-definitions/internal'; +import { IChannelStorageService } from '@fluidframework/datastore-definitions/internal'; import type { IClientConfiguration } from '@fluidframework/protocol-definitions'; import type { IClientDetails } from '@fluidframework/protocol-definitions'; import type { IDisposable as IDisposable_2 } from '@fluidframework/core-interfaces'; @@ -374,7 +374,7 @@ export interface IFluidContainerEvents extends IEvent { (event: "disposed", listener: (error?: ICriticalContainerError) => void): any; } -// @public (undocumented) +// @alpha (undocumented) export interface IFluidSerializer { decode(input: any): any; encode(value: any, bind: IFluidHandle): any; @@ -624,7 +624,7 @@ export interface ISharedObject void): any; diff --git a/packages/framework/fluid-framework/src/index.ts b/packages/framework/fluid-framework/src/index.ts index 6e96a6686677..9d43e6d0495c 100644 --- a/packages/framework/fluid-framework/src/index.ts +++ b/packages/framework/fluid-framework/src/index.ts @@ -29,7 +29,7 @@ export type { MemberChangedListener, Myself, } from "@fluidframework/fluid-static"; -export type { SharedObjectKind, ISharedObjectEvents } from "@fluidframework/shared-object-base"; +export type { SharedObjectKind } from "@fluidframework/shared-object-base"; // Let the tree package manage its own API surface, we will simply reflect it here. // Note: this only surfaces the `@public` API items from the tree package. If the `@beta` and `@alpha` items are @@ -127,4 +127,5 @@ export type { IFluidSerializer, SharedObjectCore, ISharedObject, + ISharedObjectEvents, } from "@fluidframework/shared-object-base/internal"; diff --git a/packages/runtime/datastore-definitions/api-report/datastore-definitions.api.md b/packages/runtime/datastore-definitions/api-report/datastore-definitions.api.md index 8f631c4883e3..374cd102f3b6 100644 --- a/packages/runtime/datastore-definitions/api-report/datastore-definitions.api.md +++ b/packages/runtime/datastore-definitions/api-report/datastore-definitions.api.md @@ -51,7 +51,7 @@ export interface IChannelFactory { readonly type: string; } -// @public +// @alpha export interface IChannelServices { // (undocumented) deltaConnection: IDeltaConnection; @@ -59,14 +59,14 @@ export interface IChannelServices { objectStorage: IChannelStorageService; } -// @public +// @alpha export interface IChannelStorageService { contains(path: string): Promise; list(path: string): Promise; readBlob(path: string): Promise; } -// @public +// @alpha export interface IDeltaConnection { // @deprecated (undocumented) addedGCOutboundReference?(srcHandle: IFluidHandle, outboundHandle: IFluidHandle): void; @@ -77,7 +77,7 @@ export interface IDeltaConnection { submit(messageContent: any, localOpMetadata: unknown): void; } -// @public +// @alpha export interface IDeltaHandler { applyStashedOp(message: any): void; process: (message: ISequencedDocumentMessage, local: boolean, localOpMetadata: unknown) => void; diff --git a/packages/runtime/datastore-definitions/src/channel.ts b/packages/runtime/datastore-definitions/src/channel.ts index a329291d1069..1af3b6096275 100644 --- a/packages/runtime/datastore-definitions/src/channel.ts +++ b/packages/runtime/datastore-definitions/src/channel.ts @@ -119,7 +119,7 @@ export interface IChannel extends IFluidLoadable { /** * Handler provided by shared data structure to process requests from the runtime. - * @public + * @alpha */ export interface IDeltaHandler { /** @@ -174,7 +174,7 @@ export interface IDeltaHandler { /** * Interface to represent a connection to a delta notification stream. - * @public + * @alpha */ export interface IDeltaConnection { connected: boolean; @@ -213,7 +213,7 @@ export interface IDeltaConnection { /** * Storage services to read the objects at a given path. - * @public + * @alpha */ export interface IChannelStorageService { /** @@ -234,7 +234,7 @@ export interface IChannelStorageService { /** * Storage services to read the objects at a given path using the given delta connection. - * @public + * @alpha */ export interface IChannelServices { deltaConnection: IDeltaConnection; diff --git a/packages/runtime/datastore/src/channelDeltaConnection.ts b/packages/runtime/datastore/src/channelDeltaConnection.ts index 17472877107b..dd423fa26bf0 100644 --- a/packages/runtime/datastore/src/channelDeltaConnection.ts +++ b/packages/runtime/datastore/src/channelDeltaConnection.ts @@ -5,7 +5,7 @@ import { IFluidHandle } from "@fluidframework/core-interfaces"; import { assert } from "@fluidframework/core-utils/internal"; -import { IDeltaConnection, IDeltaHandler } from "@fluidframework/datastore-definitions"; +import { IDeltaConnection, IDeltaHandler } from "@fluidframework/datastore-definitions/internal"; import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"; import { DataProcessingError } from "@fluidframework/telemetry-utils/internal"; diff --git a/packages/runtime/datastore/src/channelStorageService.ts b/packages/runtime/datastore/src/channelStorageService.ts index 31c26473c85b..0377c4e1447a 100644 --- a/packages/runtime/datastore/src/channelStorageService.ts +++ b/packages/runtime/datastore/src/channelStorageService.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; +import { IChannelStorageService } from "@fluidframework/datastore-definitions/internal"; import { IDocumentStorageService } from "@fluidframework/driver-definitions/internal"; import { ISnapshotTree } from "@fluidframework/protocol-definitions"; import { getNormalizedObjectStoragePathParts } from "@fluidframework/runtime-utils/internal"; diff --git a/packages/runtime/datastore/src/localChannelStorageService.ts b/packages/runtime/datastore/src/localChannelStorageService.ts index d180cfcb6064..2e1f1b22e327 100644 --- a/packages/runtime/datastore/src/localChannelStorageService.ts +++ b/packages/runtime/datastore/src/localChannelStorageService.ts @@ -4,7 +4,7 @@ */ import { stringToBuffer } from "@fluid-internal/client-utils"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; +import { IChannelStorageService } from "@fluidframework/datastore-definitions/internal"; import { IBlob, ITree, TreeEntry } from "@fluidframework/protocol-definitions"; import { listBlobsAtTreePath } from "@fluidframework/runtime-utils/internal"; diff --git a/packages/runtime/runtime-utils/api-report/runtime-utils.api.md b/packages/runtime/runtime-utils/api-report/runtime-utils.api.md index 74fcd472e65d..f2faad0b7f80 100644 --- a/packages/runtime/runtime-utils/api-report/runtime-utils.api.md +++ b/packages/runtime/runtime-utils/api-report/runtime-utils.api.md @@ -5,7 +5,7 @@ ```ts import { fluidHandleSymbol } from '@fluidframework/core-interfaces'; -import { IChannelStorageService } from '@fluidframework/datastore-definitions'; +import { IChannelStorageService } from '@fluidframework/datastore-definitions/internal'; import { IContainerContext } from '@fluidframework/container-definitions/internal'; import { IContainerRuntime } from '@fluidframework/container-runtime-definitions/internal'; import type { IDeltaManager } from '@fluidframework/container-definitions/internal'; diff --git a/packages/runtime/runtime-utils/src/objectstoragepartition.ts b/packages/runtime/runtime-utils/src/objectstoragepartition.ts index f5ea8cae3a7b..4b61d5e7abf0 100644 --- a/packages/runtime/runtime-utils/src/objectstoragepartition.ts +++ b/packages/runtime/runtime-utils/src/objectstoragepartition.ts @@ -4,7 +4,7 @@ */ import { assert } from "@fluidframework/core-utils/internal"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; +import { IChannelStorageService } from "@fluidframework/datastore-definitions/internal"; /** * Returns a new IChannelStorageService that resolves the given `path` as root. diff --git a/packages/runtime/test-runtime-utils/api-report/test-runtime-utils.api.md b/packages/runtime/test-runtime-utils/api-report/test-runtime-utils.api.md index 8b76d7248390..38b929d0898b 100644 --- a/packages/runtime/test-runtime-utils/api-report/test-runtime-utils.api.md +++ b/packages/runtime/test-runtime-utils/api-report/test-runtime-utils.api.md @@ -16,16 +16,16 @@ import { IAudienceEvents } from '@fluidframework/container-definitions'; import { IAudienceOwner } from '@fluidframework/container-definitions/internal'; import { IChannel } from '@fluidframework/datastore-definitions/internal'; import { IChannelFactory } from '@fluidframework/datastore-definitions/internal'; -import { IChannelServices } from '@fluidframework/datastore-definitions'; -import { IChannelStorageService } from '@fluidframework/datastore-definitions'; +import { IChannelServices } from '@fluidframework/datastore-definitions/internal'; +import { IChannelStorageService } from '@fluidframework/datastore-definitions/internal'; import type { IClient } from '@fluidframework/protocol-definitions'; import { IClientConfiguration } from '@fluidframework/protocol-definitions'; import { IClientDetails } from '@fluidframework/protocol-definitions'; import { IContainerRuntimeBase } from '@fluidframework/runtime-definitions/internal'; import type { IContainerRuntimeEvents } from '@fluidframework/container-runtime-definitions/internal'; import type { IdCreationRange } from '@fluidframework/id-compressor/internal'; -import { IDeltaConnection } from '@fluidframework/datastore-definitions'; -import { IDeltaHandler } from '@fluidframework/datastore-definitions'; +import { IDeltaConnection } from '@fluidframework/datastore-definitions/internal'; +import { IDeltaHandler } from '@fluidframework/datastore-definitions/internal'; import { IDeltaManager } from '@fluidframework/container-definitions/internal'; import { IDeltaManagerErased } from '@fluidframework/datastore-definitions/internal'; import { IDeltaManagerEvents } from '@fluidframework/container-definitions/internal'; diff --git a/packages/runtime/test-runtime-utils/src/mockStorage.ts b/packages/runtime/test-runtime-utils/src/mockStorage.ts index bc9ba0650f0e..8038dda57436 100644 --- a/packages/runtime/test-runtime-utils/src/mockStorage.ts +++ b/packages/runtime/test-runtime-utils/src/mockStorage.ts @@ -5,7 +5,7 @@ import { stringToBuffer } from "@fluid-internal/client-utils"; import { assert } from "@fluidframework/core-utils/internal"; -import { IChannelStorageService } from "@fluidframework/datastore-definitions"; +import { IChannelStorageService } from "@fluidframework/datastore-definitions/internal"; import { IBlob, ISummaryTree, ITree } from "@fluidframework/protocol-definitions"; import { convertSummaryTreeToITree, diff --git a/packages/runtime/test-runtime-utils/src/mocks.ts b/packages/runtime/test-runtime-utils/src/mocks.ts index df17249ee862..7b98e2071a67 100644 --- a/packages/runtime/test-runtime-utils/src/mocks.ts +++ b/packages/runtime/test-runtime-utils/src/mocks.ts @@ -30,8 +30,6 @@ import { IChannelStorageService, IDeltaConnection, IDeltaHandler, -} from "@fluidframework/datastore-definitions"; -import { IChannel, IFluidDataStoreRuntime, IChannelFactory, diff --git a/packages/test/test-end-to-end-tests/src/test/summarizeIncrementallySubDds.spec.ts b/packages/test/test-end-to-end-tests/src/test/summarizeIncrementallySubDds.spec.ts index 8477c082053b..8f754c7f6eed 100644 --- a/packages/test/test-end-to-end-tests/src/test/summarizeIncrementallySubDds.spec.ts +++ b/packages/test/test-end-to-end-tests/src/test/summarizeIncrementallySubDds.spec.ts @@ -8,11 +8,12 @@ import { strict as assert } from "assert"; import { describeCompat, getContainerRuntimeApi } from "@fluid-private/test-version-utils"; import { IContainer, LoaderHeader } from "@fluidframework/container-definitions/internal"; import { IContainerRuntimeOptions } from "@fluidframework/container-runtime/internal"; -import { IChannelServices, IChannelStorageService } from "@fluidframework/datastore-definitions"; import { IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, + IChannelStorageService, } from "@fluidframework/datastore-definitions/internal"; import { readAndParse } from "@fluidframework/driver-utils/internal"; import { @@ -28,8 +29,11 @@ import { channelsTreeName, } from "@fluidframework/runtime-definitions/internal"; import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal"; -import { IFluidSerializer } from "@fluidframework/shared-object-base"; -import { SharedObject, createSharedObjectKind } from "@fluidframework/shared-object-base/internal"; +import { + IFluidSerializer, + SharedObject, + createSharedObjectKind, +} from "@fluidframework/shared-object-base/internal"; import { ITestFluidObject, ITestObjectProvider, diff --git a/packages/tools/devtools/devtools-example/src/MockSharedObject.ts b/packages/tools/devtools/devtools-example/src/MockSharedObject.ts index 34d263be787b..607d0d8df580 100644 --- a/packages/tools/devtools/devtools-example/src/MockSharedObject.ts +++ b/packages/tools/devtools/devtools-example/src/MockSharedObject.ts @@ -6,8 +6,10 @@ import { TypedEventEmitter } from "@fluid-internal/client-utils"; import type { IFluidHandle } from "@fluidframework/core-interfaces"; import type { IChannelAttributes } from "@fluidframework/datastore-definitions/internal"; -import type { ISharedObjectEvents } from "@fluidframework/shared-object-base"; -import type { ISharedObject } from "@fluidframework/shared-object-base/internal"; +import type { + ISharedObject, + ISharedObjectEvents, +} from "@fluidframework/shared-object-base/internal"; import { MockHandle } from "@fluidframework/test-runtime-utils/internal"; /** diff --git a/packages/tools/replay-tool/src/unknownChannel.ts b/packages/tools/replay-tool/src/unknownChannel.ts index 564f91cc6919..f39b2953115d 100644 --- a/packages/tools/replay-tool/src/unknownChannel.ts +++ b/packages/tools/replay-tool/src/unknownChannel.ts @@ -5,12 +5,12 @@ import { IFluidHandle } from "@fluidframework/core-interfaces"; import { FluidDataStoreRuntime, ISharedObjectRegistry } from "@fluidframework/datastore/internal"; -import { IChannelServices } from "@fluidframework/datastore-definitions"; import { IChannel, IChannelAttributes, IChannelFactory, IFluidDataStoreRuntime, + IChannelServices, } from "@fluidframework/datastore-definitions/internal"; import { ISequencedDocumentMessage, SummaryType } from "@fluidframework/protocol-definitions"; import {