fluid-framework 2.0.0-dev-rc.2.0.0.245554 → 2.0.0-dev-rc.3.0.0.250606

package/api-report/fluid-framework.api.md

@@ -6,16 +6,15 @@
 
 import { FluidObject } from '@fluidframework/core-interfaces';
 import { IChannel } from '@fluidframework/datastore-definitions';
-import { IChannelFactory } from '@fluidframework/datastore-definitions';
 import type { IErrorBase } from '@fluidframework/core-interfaces';
 import { IEvent } from '@fluidframework/core-interfaces';
 import { IEventProvider } from '@fluidframework/core-interfaces';
 import { IEventThisPlaceHolder } from '@fluidframework/core-interfaces';
-import type { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions';
 import { IFluidHandle } from '@fluidframework/core-interfaces';
 import { IFluidLoadable } from '@fluidframework/core-interfaces';
 import { ISharedObject } from '@fluidframework/shared-object-base';
 import { ISharedObjectEvents } from '@fluidframework/shared-object-base';
+import { ISharedObjectKind } from '@fluidframework/shared-object-base';
 
 // @public
 export type AllowedTypes = readonly LazyItem<TreeNodeSchema>[];
@@ -88,11 +87,11 @@ export interface ContainerSchema {
 }
 
 // @public
-export type DataObjectClass<T extends IFluidLoadable> = {
+export type DataObjectClass<T extends IFluidLoadable = IFluidLoadable> = {
     readonly factory: {
         IFluidDataStoreFactory: DataObjectClass<T>["factory"];
     };
-} & LoadableObjectCtor<T>;
+} & (new (...args: any[]) => T);
 
 // @public
 export const disposeSymbol: unique symbol;
@@ -278,14 +277,11 @@ export interface IValueChanged {
 export type LazyItem<Item = unknown> = Item | (() => Item);
 
 // @public
-export type LoadableObjectClass<T extends IFluidLoadable = IFluidLoadable> = SharedObjectClass<T> | DataObjectClass<T>;
+export type LoadableObjectClass<T extends IFluidLoadable = IFluidLoadable> = ISharedObjectKind<T> | DataObjectClass<T>;
 
 // @public
 export type LoadableObjectClassRecord = Record<string, LoadableObjectClass>;
 
-// @public
-export type LoadableObjectCtor<T extends IFluidLoadable> = new (...args: any[]) => T;
-
 // @public
 export interface MakeNominal {
 }
@@ -366,23 +362,13 @@ export interface SchemaIncompatible {
 export type ScopedSchemaName<TScope extends string | undefined, TName extends number | string> = TScope extends undefined ? `${TName}` : `${TScope}.${TName}`;
 
 // @public @deprecated
-export const SharedMap: {
-    getFactory(): IChannelFactory<ISharedMap>;
-    create(runtime: IFluidDataStoreRuntime, id?: string): ISharedMap;
-};
+export const SharedMap: ISharedObjectKind<ISharedMap>;
 
 // @public @deprecated
 export type SharedMap = ISharedMap;
 
 // @public
-export interface SharedObjectClass<T extends IFluidLoadable> {
-    readonly getFactory: () => IChannelFactory<T>;
-}
-
-// @public
-export const SharedTree: {
-    getFactory(): IChannelFactory<ITree>;
-};
+export const SharedTree: ISharedObjectKind<ITree>;
 
 // @public
 export const Tree: TreeApi;
@@ -394,7 +380,7 @@ export interface TreeApi extends TreeNodeApi {
 }
 
 // @public
-export interface TreeArrayNode<TAllowedTypes extends ImplicitAllowedTypes = ImplicitAllowedTypes> extends TreeNode, TreeArrayNodeBase<TreeNodeFromImplicitAllowedTypes<TAllowedTypes>, InsertableTreeNodeFromImplicitAllowedTypes<TAllowedTypes>, TreeArrayNode> {
+export interface TreeArrayNode<TAllowedTypes extends ImplicitAllowedTypes = ImplicitAllowedTypes> extends TreeArrayNodeBase<TreeNodeFromImplicitAllowedTypes<TAllowedTypes>, InsertableTreeNodeFromImplicitAllowedTypes<TAllowedTypes>, TreeArrayNode> {
 }
 
 // @public

package/dist/fluid-framework-alpha.d.ts

@@ -7,16 +7,15 @@
 
 import { FluidObject } from '@fluidframework/core-interfaces';
 import { IChannel } from '@fluidframework/datastore-definitions';
-import { IChannelFactory } from '@fluidframework/datastore-definitions';
 import type { IErrorBase } from '@fluidframework/core-interfaces';
 import { IEvent } from '@fluidframework/core-interfaces';
 import { IEventProvider } from '@fluidframework/core-interfaces';
 import { IEventThisPlaceHolder } from '@fluidframework/core-interfaces';
-import type { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions';
 import { IFluidHandle } from '@fluidframework/core-interfaces';
 import { IFluidLoadable } from '@fluidframework/core-interfaces';
 import { ISharedObject } from '@fluidframework/shared-object-base';
 import { ISharedObjectEvents } from '@fluidframework/shared-object-base';
+import { ISharedObjectKind } from '@fluidframework/shared-object-base';
 
 /**
  * Types for use in fields.
@@ -230,11 +229,11 @@ export declare interface ContainerSchema {
  * @typeParam T - The class of the `DataObject`.
  * @public
  */
-export declare type DataObjectClass<T extends IFluidLoadable> = {
+export declare type DataObjectClass<T extends IFluidLoadable = IFluidLoadable> = {
     readonly factory: {
         IFluidDataStoreFactory: DataObjectClass<T>["factory"];
     };
-} & LoadableObjectCtor<T>;
+} & (new (...args: any[]) => T);
 
 /**
  * Placeholder for `Symbol.dispose`.
@@ -968,10 +967,10 @@ export declare type LazyItem<Item = unknown> = Item | (() => Item);
  * There are some edge cases in TypeScript where the order of the members in a union matter.
  * Once such edge case is when multiple members of a generic union partially match, and the type parameter is being inferred.
  * In this case, its better to have the desired match and/or the simpler type first.
- * In this case placing SharedObjectClass fixed one usage and didn't break anything, and generally seems more likely to work than the reverse, so this is the order being used.
+ * In this case placing ISharedObjectKind fixed one usage and didn't break anything, and generally seems more likely to work than the reverse, so this is the order being used.
  * This is likely (a bug in TypeScript)[https://github.com/microsoft/TypeScript/issues/45809].
  */
-export declare type LoadableObjectClass<T extends IFluidLoadable = IFluidLoadable> = SharedObjectClass<T> | DataObjectClass<T>;
+export declare type LoadableObjectClass<T extends IFluidLoadable = IFluidLoadable> = ISharedObjectKind<T> | DataObjectClass<T>;
 
 /**
  * A mapping of string identifiers to classes that will later be used to instantiate a corresponding `DataObject`
@@ -980,14 +979,6 @@ export declare type LoadableObjectClass<T extends IFluidLoadable = IFluidLoadabl
  */
 export declare type LoadableObjectClassRecord = Record<string, LoadableObjectClass>;
 
-/**
- * An object with a constructor that will return an {@link @fluidframework/core-interfaces#IFluidLoadable}.
- *
- * @typeParam T - The class of the loadable object.
- * @public
- */
-export declare type LoadableObjectCtor<T extends IFluidLoadable> = new (...args: any[]) => T;
-
 /**
  * Utilities for manipulating the typescript typechecker.
  *
@@ -1471,34 +1462,9 @@ export declare type ScopedSchemaName<TScope extends string | undefined, TName ex
 /**
  * {@inheritDoc ISharedMap}
  * @public
- * @deprecated Please use SharedTree for new containers.  SharedMap is supported for loading preexisting Fluid Framework 1.0 containers only.
+ * @deprecated Please use SharedTree for new containers. SharedMap is supported for loading preexisting Fluid Framework 1.0 containers only.
  */
-export declare const SharedMap: {
-    /**
-     * Get a factory for SharedMap to register with the data store.
-     * @returns A factory that creates SharedMaps and loads them from storage.
-     */
-    getFactory(): IChannelFactory<ISharedMap>;
-    /**
-     * Create a new shared map.
-     * @param runtime - The data store runtime that the new shared map belongs to.
-     * @param id - Optional name of the shared map.
-     * @returns Newly created shared map.
-     *
-     * @example
-     * To create a `SharedMap`, call the static create method:
-     *
-     * ```typescript
-     * const myMap = SharedMap.create(this.runtime, id);
-     * ```
-     * @privateRemarks
-     * TODO:
-     * Clarify how this differs from `MapFactory.create`.
-     * They are different since making this forward to MapFactory.create breaks some things,
-     * but the difference is unclear from the documentation.
-     */
-    create(runtime: IFluidDataStoreRuntime, id?: string): ISharedMap;
-};
+export declare const SharedMap: ISharedObjectKind<ISharedMap>;
 
 /**
  * {@inheritDoc ISharedMap}
@@ -1510,35 +1476,11 @@ export declare const SharedMap: {
 export declare type SharedMap = ISharedMap;
 
 /**
- * A factory that produces a factory that can create a DDSes (`SharedObject`s).
- *
- * @typeParam T - The class of the `SharedObject`.
- * @public
- */
-export declare interface SharedObjectClass<T extends IFluidLoadable> {
-    /**
-     * Gets the factory this factory is a wrapper for.
-     */
-    readonly getFactory: () => IChannelFactory<T>;
-}
-
-/**
- * SharedTree is a hierarchical data structure for collaboratively editing JSON-like trees
+ * SharedTree is a hierarchical data structure for collaboratively editing strongly typed JSON-like trees
  * of objects, arrays, and other data types.
- *
- * @remarks
- * This implements {@link @fluidframework/fluid-static#SharedObjectClass}.
- * @privateRemarks
- * Due to the dependency structure and the placement of that interface SharedObjectClass,
- * this interface implementation can not be recorded in the type here.
  * @public
  */
-export declare const SharedTree: {
-    /**
-     * Gets the factory this factory is a wrapper for.
-     */
-    getFactory(): IChannelFactory<ITree>;
-};
+export declare const SharedTree: ISharedObjectKind<ITree>;
 
 /**
  * The `Tree` object holds various functions for interacting with {@link TreeNode}s.
@@ -1595,7 +1537,7 @@ export declare interface TreeApi extends TreeNodeApi {
  *
  * @public
  */
-export declare interface TreeArrayNode<TAllowedTypes extends ImplicitAllowedTypes = ImplicitAllowedTypes> extends TreeNode, TreeArrayNodeBase<TreeNodeFromImplicitAllowedTypes<TAllowedTypes>, InsertableTreeNodeFromImplicitAllowedTypes<TAllowedTypes>, TreeArrayNode> {
+export declare interface TreeArrayNode<TAllowedTypes extends ImplicitAllowedTypes = ImplicitAllowedTypes> extends TreeArrayNodeBase<TreeNodeFromImplicitAllowedTypes<TAllowedTypes>, InsertableTreeNodeFromImplicitAllowedTypes<TAllowedTypes>, TreeArrayNode> {
 }
 
 /**

package/dist/fluid-framework-beta.d.ts

@@ -7,16 +7,15 @@
 
 import { FluidObject } from '@fluidframework/core-interfaces';
 import { IChannel } from '@fluidframework/datastore-definitions';
-import { IChannelFactory } from '@fluidframework/datastore-definitions';
 import type { IErrorBase } from '@fluidframework/core-interfaces';
 import { IEvent } from '@fluidframework/core-interfaces';
 import { IEventProvider } from '@fluidframework/core-interfaces';
 import { IEventThisPlaceHolder } from '@fluidframework/core-interfaces';
-import type { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions';
 import { IFluidHandle } from '@fluidframework/core-interfaces';
 import { IFluidLoadable } from '@fluidframework/core-interfaces';
 import { ISharedObject } from '@fluidframework/shared-object-base';
 import { ISharedObjectEvents } from '@fluidframework/shared-object-base';
+import { ISharedObjectKind } from '@fluidframework/shared-object-base';
 
 /**
  * Types for use in fields.
@@ -209,11 +208,11 @@ export declare interface ContainerSchema {
  * @typeParam T - The class of the `DataObject`.
  * @public
  */
-export declare type DataObjectClass<T extends IFluidLoadable> = {
+export declare type DataObjectClass<T extends IFluidLoadable = IFluidLoadable> = {
     readonly factory: {
         IFluidDataStoreFactory: DataObjectClass<T>["factory"];
     };
-} & LoadableObjectCtor<T>;
+} & (new (...args: any[]) => T);
 
 /**
  * Placeholder for `Symbol.dispose`.
@@ -947,10 +946,10 @@ export declare type LazyItem<Item = unknown> = Item | (() => Item);
  * There are some edge cases in TypeScript where the order of the members in a union matter.
  * Once such edge case is when multiple members of a generic union partially match, and the type parameter is being inferred.
  * In this case, its better to have the desired match and/or the simpler type first.
- * In this case placing SharedObjectClass fixed one usage and didn't break anything, and generally seems more likely to work than the reverse, so this is the order being used.
+ * In this case placing ISharedObjectKind fixed one usage and didn't break anything, and generally seems more likely to work than the reverse, so this is the order being used.
  * This is likely (a bug in TypeScript)[https://github.com/microsoft/TypeScript/issues/45809].
  */
-export declare type LoadableObjectClass<T extends IFluidLoadable = IFluidLoadable> = SharedObjectClass<T> | DataObjectClass<T>;
+export declare type LoadableObjectClass<T extends IFluidLoadable = IFluidLoadable> = ISharedObjectKind<T> | DataObjectClass<T>;
 
 /**
  * A mapping of string identifiers to classes that will later be used to instantiate a corresponding `DataObject`
@@ -959,14 +958,6 @@ export declare type LoadableObjectClass<T extends IFluidLoadable = IFluidLoadabl
  */
 export declare type LoadableObjectClassRecord = Record<string, LoadableObjectClass>;
 
-/**
- * An object with a constructor that will return an {@link @fluidframework/core-interfaces#IFluidLoadable}.
- *
- * @typeParam T - The class of the loadable object.
- * @public
- */
-export declare type LoadableObjectCtor<T extends IFluidLoadable> = new (...args: any[]) => T;
-
 /**
  * Utilities for manipulating the typescript typechecker.
  *
@@ -1450,34 +1441,9 @@ export declare type ScopedSchemaName<TScope extends string | undefined, TName ex
 /**
  * {@inheritDoc ISharedMap}
  * @public
- * @deprecated Please use SharedTree for new containers.  SharedMap is supported for loading preexisting Fluid Framework 1.0 containers only.
+ * @deprecated Please use SharedTree for new containers. SharedMap is supported for loading preexisting Fluid Framework 1.0 containers only.
  */
-export declare const SharedMap: {
-    /**
-     * Get a factory for SharedMap to register with the data store.
-     * @returns A factory that creates SharedMaps and loads them from storage.
-     */
-    getFactory(): IChannelFactory<ISharedMap>;
-    /**
-     * Create a new shared map.
-     * @param runtime - The data store runtime that the new shared map belongs to.
-     * @param id - Optional name of the shared map.
-     * @returns Newly created shared map.
-     *
-     * @example
-     * To create a `SharedMap`, call the static create method:
-     *
-     * ```typescript
-     * const myMap = SharedMap.create(this.runtime, id);
-     * ```
-     * @privateRemarks
-     * TODO:
-     * Clarify how this differs from `MapFactory.create`.
-     * They are different since making this forward to MapFactory.create breaks some things,
-     * but the difference is unclear from the documentation.
-     */
-    create(runtime: IFluidDataStoreRuntime, id?: string): ISharedMap;
-};
+export declare const SharedMap: ISharedObjectKind<ISharedMap>;
 
 /**
  * {@inheritDoc ISharedMap}
@@ -1489,35 +1455,11 @@ export declare const SharedMap: {
 export declare type SharedMap = ISharedMap;
 
 /**
- * A factory that produces a factory that can create a DDSes (`SharedObject`s).
- *
- * @typeParam T - The class of the `SharedObject`.
- * @public
- */
-export declare interface SharedObjectClass<T extends IFluidLoadable> {
-    /**
-     * Gets the factory this factory is a wrapper for.
-     */
-    readonly getFactory: () => IChannelFactory<T>;
-}
-
-/**
- * SharedTree is a hierarchical data structure for collaboratively editing JSON-like trees
+ * SharedTree is a hierarchical data structure for collaboratively editing strongly typed JSON-like trees
  * of objects, arrays, and other data types.
- *
- * @remarks
- * This implements {@link @fluidframework/fluid-static#SharedObjectClass}.
- * @privateRemarks
- * Due to the dependency structure and the placement of that interface SharedObjectClass,
- * this interface implementation can not be recorded in the type here.
  * @public
  */
-export declare const SharedTree: {
-    /**
-     * Gets the factory this factory is a wrapper for.
-     */
-    getFactory(): IChannelFactory<ITree>;
-};
+export declare const SharedTree: ISharedObjectKind<ITree>;
 
 /**
  * The `Tree` object holds various functions for interacting with {@link TreeNode}s.
@@ -1574,7 +1516,7 @@ export declare interface TreeApi extends TreeNodeApi {
  *
  * @public
  */
-export declare interface TreeArrayNode<TAllowedTypes extends ImplicitAllowedTypes = ImplicitAllowedTypes> extends TreeNode, TreeArrayNodeBase<TreeNodeFromImplicitAllowedTypes<TAllowedTypes>, InsertableTreeNodeFromImplicitAllowedTypes<TAllowedTypes>, TreeArrayNode> {
+export declare interface TreeArrayNode<TAllowedTypes extends ImplicitAllowedTypes = ImplicitAllowedTypes> extends TreeArrayNodeBase<TreeNodeFromImplicitAllowedTypes<TAllowedTypes>, InsertableTreeNodeFromImplicitAllowedTypes<TAllowedTypes>, TreeArrayNode> {
 }
 
 /**

package/dist/fluid-framework-public.d.ts

@@ -7,16 +7,15 @@
 
 import { FluidObject } from '@fluidframework/core-interfaces';
 import { IChannel } from '@fluidframework/datastore-definitions';
-import { IChannelFactory } from '@fluidframework/datastore-definitions';
 import type { IErrorBase } from '@fluidframework/core-interfaces';
 import { IEvent } from '@fluidframework/core-interfaces';
 import { IEventProvider } from '@fluidframework/core-interfaces';
 import { IEventThisPlaceHolder } from '@fluidframework/core-interfaces';
-import type { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions';
 import { IFluidHandle } from '@fluidframework/core-interfaces';
 import { IFluidLoadable } from '@fluidframework/core-interfaces';
 import { ISharedObject } from '@fluidframework/shared-object-base';
 import { ISharedObjectEvents } from '@fluidframework/shared-object-base';
+import { ISharedObjectKind } from '@fluidframework/shared-object-base';
 
 /**
  * Types for use in fields.
@@ -209,11 +208,11 @@ export declare interface ContainerSchema {
  * @typeParam T - The class of the `DataObject`.
  * @public
  */
-export declare type DataObjectClass<T extends IFluidLoadable> = {
+export declare type DataObjectClass<T extends IFluidLoadable = IFluidLoadable> = {
     readonly factory: {
         IFluidDataStoreFactory: DataObjectClass<T>["factory"];
     };
-} & LoadableObjectCtor<T>;
+} & (new (...args: any[]) => T);
 
 /**
  * Placeholder for `Symbol.dispose`.
@@ -947,10 +946,10 @@ export declare type LazyItem<Item = unknown> = Item | (() => Item);
  * There are some edge cases in TypeScript where the order of the members in a union matter.
  * Once such edge case is when multiple members of a generic union partially match, and the type parameter is being inferred.
  * In this case, its better to have the desired match and/or the simpler type first.
- * In this case placing SharedObjectClass fixed one usage and didn't break anything, and generally seems more likely to work than the reverse, so this is the order being used.
+ * In this case placing ISharedObjectKind fixed one usage and didn't break anything, and generally seems more likely to work than the reverse, so this is the order being used.
  * This is likely (a bug in TypeScript)[https://github.com/microsoft/TypeScript/issues/45809].
  */
-export declare type LoadableObjectClass<T extends IFluidLoadable = IFluidLoadable> = SharedObjectClass<T> | DataObjectClass<T>;
+export declare type LoadableObjectClass<T extends IFluidLoadable = IFluidLoadable> = ISharedObjectKind<T> | DataObjectClass<T>;
 
 /**
  * A mapping of string identifiers to classes that will later be used to instantiate a corresponding `DataObject`
@@ -959,14 +958,6 @@ export declare type LoadableObjectClass<T extends IFluidLoadable = IFluidLoadabl
  */
 export declare type LoadableObjectClassRecord = Record<string, LoadableObjectClass>;
 
-/**
- * An object with a constructor that will return an {@link @fluidframework/core-interfaces#IFluidLoadable}.
- *
- * @typeParam T - The class of the loadable object.
- * @public
- */
-export declare type LoadableObjectCtor<T extends IFluidLoadable> = new (...args: any[]) => T;
-
 /**
  * Utilities for manipulating the typescript typechecker.
  *
@@ -1450,34 +1441,9 @@ export declare type ScopedSchemaName<TScope extends string | undefined, TName ex
 /**
  * {@inheritDoc ISharedMap}
  * @public
- * @deprecated Please use SharedTree for new containers.  SharedMap is supported for loading preexisting Fluid Framework 1.0 containers only.
+ * @deprecated Please use SharedTree for new containers. SharedMap is supported for loading preexisting Fluid Framework 1.0 containers only.
  */
-export declare const SharedMap: {
-    /**
-     * Get a factory for SharedMap to register with the data store.
-     * @returns A factory that creates SharedMaps and loads them from storage.
-     */
-    getFactory(): IChannelFactory<ISharedMap>;
-    /**
-     * Create a new shared map.
-     * @param runtime - The data store runtime that the new shared map belongs to.
-     * @param id - Optional name of the shared map.
-     * @returns Newly created shared map.
-     *
-     * @example
-     * To create a `SharedMap`, call the static create method:
-     *
-     * ```typescript
-     * const myMap = SharedMap.create(this.runtime, id);
-     * ```
-     * @privateRemarks
-     * TODO:
-     * Clarify how this differs from `MapFactory.create`.
-     * They are different since making this forward to MapFactory.create breaks some things,
-     * but the difference is unclear from the documentation.
-     */
-    create(runtime: IFluidDataStoreRuntime, id?: string): ISharedMap;
-};
+export declare const SharedMap: ISharedObjectKind<ISharedMap>;
 
 /**
  * {@inheritDoc ISharedMap}
@@ -1489,35 +1455,11 @@ export declare const SharedMap: {
 export declare type SharedMap = ISharedMap;
 
 /**
- * A factory that produces a factory that can create a DDSes (`SharedObject`s).
- *
- * @typeParam T - The class of the `SharedObject`.
- * @public
- */
-export declare interface SharedObjectClass<T extends IFluidLoadable> {
-    /**
-     * Gets the factory this factory is a wrapper for.
-     */
-    readonly getFactory: () => IChannelFactory<T>;
-}
-
-/**
- * SharedTree is a hierarchical data structure for collaboratively editing JSON-like trees
+ * SharedTree is a hierarchical data structure for collaboratively editing strongly typed JSON-like trees
  * of objects, arrays, and other data types.
- *
- * @remarks
- * This implements {@link @fluidframework/fluid-static#SharedObjectClass}.
- * @privateRemarks
- * Due to the dependency structure and the placement of that interface SharedObjectClass,
- * this interface implementation can not be recorded in the type here.
  * @public
  */
-export declare const SharedTree: {
-    /**
-     * Gets the factory this factory is a wrapper for.
-     */
-    getFactory(): IChannelFactory<ITree>;
-};
+export declare const SharedTree: ISharedObjectKind<ITree>;
 
 /**
  * The `Tree` object holds various functions for interacting with {@link TreeNode}s.
@@ -1574,7 +1516,7 @@ export declare interface TreeApi extends TreeNodeApi {
  *
  * @public
  */
-export declare interface TreeArrayNode<TAllowedTypes extends ImplicitAllowedTypes = ImplicitAllowedTypes> extends TreeNode, TreeArrayNodeBase<TreeNodeFromImplicitAllowedTypes<TAllowedTypes>, InsertableTreeNodeFromImplicitAllowedTypes<TAllowedTypes>, TreeArrayNode> {
+export declare interface TreeArrayNode<TAllowedTypes extends ImplicitAllowedTypes = ImplicitAllowedTypes> extends TreeArrayNodeBase<TreeNodeFromImplicitAllowedTypes<TAllowedTypes>, InsertableTreeNodeFromImplicitAllowedTypes<TAllowedTypes>, TreeArrayNode> {
 }
 
 /**

package/dist/fluid-framework-untrimmed.d.ts

@@ -7,16 +7,15 @@
 
 import { FluidObject } from '@fluidframework/core-interfaces';
 import { IChannel } from '@fluidframework/datastore-definitions';
-import { IChannelFactory } from '@fluidframework/datastore-definitions';
 import type { IErrorBase } from '@fluidframework/core-interfaces';
 import { IEvent } from '@fluidframework/core-interfaces';
 import { IEventProvider } from '@fluidframework/core-interfaces';
 import { IEventThisPlaceHolder } from '@fluidframework/core-interfaces';
-import type { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions';
 import { IFluidHandle } from '@fluidframework/core-interfaces';
 import { IFluidLoadable } from '@fluidframework/core-interfaces';
 import { ISharedObject } from '@fluidframework/shared-object-base';
 import { ISharedObjectEvents } from '@fluidframework/shared-object-base';
+import { ISharedObjectKind } from '@fluidframework/shared-object-base';
 
 /**
  * Types for use in fields.
@@ -230,11 +229,11 @@ export declare interface ContainerSchema {
  * @typeParam T - The class of the `DataObject`.
  * @public
  */
-export declare type DataObjectClass<T extends IFluidLoadable> = {
+export declare type DataObjectClass<T extends IFluidLoadable = IFluidLoadable> = {
     readonly factory: {
         IFluidDataStoreFactory: DataObjectClass<T>["factory"];
     };
-} & LoadableObjectCtor<T>;
+} & (new (...args: any[]) => T);
 
 /**
  * Placeholder for `Symbol.dispose`.
@@ -968,10 +967,10 @@ export declare type LazyItem<Item = unknown> = Item | (() => Item);
  * There are some edge cases in TypeScript where the order of the members in a union matter.
  * Once such edge case is when multiple members of a generic union partially match, and the type parameter is being inferred.
  * In this case, its better to have the desired match and/or the simpler type first.
- * In this case placing SharedObjectClass fixed one usage and didn't break anything, and generally seems more likely to work than the reverse, so this is the order being used.
+ * In this case placing ISharedObjectKind fixed one usage and didn't break anything, and generally seems more likely to work than the reverse, so this is the order being used.
  * This is likely (a bug in TypeScript)[https://github.com/microsoft/TypeScript/issues/45809].
  */
-export declare type LoadableObjectClass<T extends IFluidLoadable = IFluidLoadable> = SharedObjectClass<T> | DataObjectClass<T>;
+export declare type LoadableObjectClass<T extends IFluidLoadable = IFluidLoadable> = ISharedObjectKind<T> | DataObjectClass<T>;
 
 /**
  * A mapping of string identifiers to classes that will later be used to instantiate a corresponding `DataObject`
@@ -980,14 +979,6 @@ export declare type LoadableObjectClass<T extends IFluidLoadable = IFluidLoadabl
  */
 export declare type LoadableObjectClassRecord = Record<string, LoadableObjectClass>;
 
-/**
- * An object with a constructor that will return an {@link @fluidframework/core-interfaces#IFluidLoadable}.
- *
- * @typeParam T - The class of the loadable object.
- * @public
- */
-export declare type LoadableObjectCtor<T extends IFluidLoadable> = new (...args: any[]) => T;
-
 /**
  * Utilities for manipulating the typescript typechecker.
  *
@@ -1471,34 +1462,9 @@ export declare type ScopedSchemaName<TScope extends string | undefined, TName ex
 /**
  * {@inheritDoc ISharedMap}
  * @public
- * @deprecated Please use SharedTree for new containers.  SharedMap is supported for loading preexisting Fluid Framework 1.0 containers only.
+ * @deprecated Please use SharedTree for new containers. SharedMap is supported for loading preexisting Fluid Framework 1.0 containers only.
  */
-export declare const SharedMap: {
-    /**
-     * Get a factory for SharedMap to register with the data store.
-     * @returns A factory that creates SharedMaps and loads them from storage.
-     */
-    getFactory(): IChannelFactory<ISharedMap>;
-    /**
-     * Create a new shared map.
-     * @param runtime - The data store runtime that the new shared map belongs to.
-     * @param id - Optional name of the shared map.
-     * @returns Newly created shared map.
-     *
-     * @example
-     * To create a `SharedMap`, call the static create method:
-     *
-     * ```typescript
-     * const myMap = SharedMap.create(this.runtime, id);
-     * ```
-     * @privateRemarks
-     * TODO:
-     * Clarify how this differs from `MapFactory.create`.
-     * They are different since making this forward to MapFactory.create breaks some things,
-     * but the difference is unclear from the documentation.
-     */
-    create(runtime: IFluidDataStoreRuntime, id?: string): ISharedMap;
-};
+export declare const SharedMap: ISharedObjectKind<ISharedMap>;
 
 /**
  * {@inheritDoc ISharedMap}
@@ -1510,35 +1476,11 @@ export declare const SharedMap: {
 export declare type SharedMap = ISharedMap;
 
 /**
- * A factory that produces a factory that can create a DDSes (`SharedObject`s).
- *
- * @typeParam T - The class of the `SharedObject`.
- * @public
- */
-export declare interface SharedObjectClass<T extends IFluidLoadable> {
-    /**
-     * Gets the factory this factory is a wrapper for.
-     */
-    readonly getFactory: () => IChannelFactory<T>;
-}
-
-/**
- * SharedTree is a hierarchical data structure for collaboratively editing JSON-like trees
+ * SharedTree is a hierarchical data structure for collaboratively editing strongly typed JSON-like trees
  * of objects, arrays, and other data types.
- *
- * @remarks
- * This implements {@link @fluidframework/fluid-static#SharedObjectClass}.
- * @privateRemarks
- * Due to the dependency structure and the placement of that interface SharedObjectClass,
- * this interface implementation can not be recorded in the type here.
  * @public
  */
-export declare const SharedTree: {
-    /**
-     * Gets the factory this factory is a wrapper for.
-     */
-    getFactory(): IChannelFactory<ITree>;
-};
+export declare const SharedTree: ISharedObjectKind<ITree>;
 
 /**
  * The `Tree` object holds various functions for interacting with {@link TreeNode}s.
@@ -1595,7 +1537,7 @@ export declare interface TreeApi extends TreeNodeApi {
  *
  * @public
  */
-export declare interface TreeArrayNode<TAllowedTypes extends ImplicitAllowedTypes = ImplicitAllowedTypes> extends TreeNode, TreeArrayNodeBase<TreeNodeFromImplicitAllowedTypes<TAllowedTypes>, InsertableTreeNodeFromImplicitAllowedTypes<TAllowedTypes>, TreeArrayNode> {
+export declare interface TreeArrayNode<TAllowedTypes extends ImplicitAllowedTypes = ImplicitAllowedTypes> extends TreeArrayNodeBase<TreeNodeFromImplicitAllowedTypes<TAllowedTypes>, InsertableTreeNodeFromImplicitAllowedTypes<TAllowedTypes>, TreeArrayNode> {
 }
 
 /**

package/dist/index.d.ts

@@ -13,7 +13,7 @@ ICriticalContainerError, } from "@fluidframework/container-definitions";
 export { AttachState, ContainerErrorTypes } from "@fluidframework/container-definitions";
 export { DriverErrorTypes } from "@fluidframework/driver-definitions";
 export { ConnectionState } from "@fluidframework/container-loader";
-export type { ContainerAttachProps, ContainerSchema, DataObjectClass, IConnection, IFluidContainer, IFluidContainerEvents, IMember, InitialObjects, IServiceAudience, IServiceAudienceEvents, LoadableObjectClass, LoadableObjectClassRecord, LoadableObjectCtor, MemberChangedListener, Myself, SharedObjectClass, } from "@fluidframework/fluid-static";
+export type { ContainerAttachProps, ContainerSchema, DataObjectClass, IConnection, IFluidContainer, IFluidContainerEvents, IMember, InitialObjects, IServiceAudience, IServiceAudienceEvents, LoadableObjectClass, LoadableObjectClassRecord, MemberChangedListener, Myself, } from "@fluidframework/fluid-static";
 export type { ISharedMap, ISharedMapEvents, IValueChanged } from "@fluidframework/map";
 export { SharedMap } from "@fluidframework/map";
 export * from "@fluidframework/tree";