Remove several types from @public scope

.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.

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';

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";

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";

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";
 

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<ISharedMap> & SharedObjectKind<ISharedMap>;

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

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,

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";

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";

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';

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<TOp> {
 	client: string;

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";
 

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,

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';

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";

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';

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";

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,

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,

experimental/dds/tree/api-report/experimental-tree.api.md

@@ -8,18 +8,18 @@ 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';
 import { IExperimentalIncrementalSummaryContext } from '@fluidframework/runtime-definitions/internal';
 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';

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,

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';

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';

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';

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';

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';
 

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';