@fluidframework/fluid-static 2.0.0-rc.1.0.6 → 2.0.0-rc.2.0.1

package/{.eslintrc.js → .eslintrc.cjs}

@@ -4,7 +4,7 @@
  */
 
 module.exports = {
-	extends: [require.resolve("@fluidframework/eslint-config-fluid/minimal"), "prettier"],
+	extends: [require.resolve("@fluidframework/eslint-config-fluid/strict"), "prettier"],
 	parserOptions: {
 		project: ["./tsconfig.json", "./src/test/tsconfig.json"],
 	},

package/{.mocharc.js → .mocharc.cjs}

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const getFluidTestMochaConfig = require("@fluidframework/mocha-test-setup/mocharc-common");
+const getFluidTestMochaConfig = require("@fluid-internal/mocha-test-setup/mocharc-common");
 
 const packageDir = __dirname;
 const config = getFluidTestMochaConfig(packageDir);

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @fluidframework/fluid-static
 
+## 2.0.0-rc.2.0.0
+
+### Minor Changes
+
+-   fluid-framework: ContainerSchema is now readonly ([#19717](https://github.com/microsoft/FluidFramework/issues/19717)) [ae1d0be26d](https://github.com/microsoft/FluidFramework/commits/ae1d0be26d61453cff316b3f622a9f3647149167)
+
+    The `ContainerSchema` type is intended for defining input to these packages. This should make the APIs more tolerant and
+    thus be non-breaking, however its possible for some users of `ContainerSchema` to use it in ways where this could be a
+    breaking change: any such users should remove their mutations and/or use a different type.
+
 ## 2.0.0-rc.1.0.0
 
 ### Minor Changes

package/{api-extractor-esm.json → api-extractor-cjs.json}

@@ -1,4 +1,8 @@
 {
 	"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-	"extends": "../../../common/build/build-common/api-extractor-base-esm.json"
+	"extends": "../../../common/build/build-common/api-extractor-base.cjs.primary.json",
+	// CJS is actually secondary; so, no report.
+	"apiReport": {
+		"enabled": false
+	}
 }

package/api-extractor.json

@@ -1,4 +1,4 @@
 {
 	"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-	"extends": "../../../common/build/build-common/api-extractor-base.json"
+	"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
 }

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

@@ -15,28 +15,31 @@ import { IEventProvider } from '@fluidframework/core-interfaces';
 import { IFluidLoadable } from '@fluidframework/core-interfaces';
 import { IRuntimeFactory } from '@fluidframework/container-definitions';
 
+// @public
+export type ContainerAttachProps<T = unknown> = T;
+
 // @public
 export interface ContainerSchema {
-    dynamicObjectTypes?: LoadableObjectClass<any>[];
-    initialObjects: LoadableObjectClassRecord;
+    readonly dynamicObjectTypes?: readonly LoadableObjectClass[];
+    readonly initialObjects: LoadableObjectClassRecord;
 }
 
-// @internal (undocumented)
+// @internal
 export function createDOProviderContainerRuntimeFactory(props: {
     schema: ContainerSchema;
 }): IRuntimeFactory;
 
-// @internal (undocumented)
+// @internal
 export function createFluidContainer<TContainerSchema extends ContainerSchema = ContainerSchema>(props: {
     container: IContainer;
     rootDataObject: IRootDataObject;
 }): IFluidContainer<TContainerSchema>;
 
-// @internal (undocumented)
-export function createServiceAudience<M extends IMember = IMember>(props: {
+// @internal
+export function createServiceAudience<TMember extends IMember = IMember>(props: {
     container: IContainer;
-    createServiceMember: (audienceMember: IClient) => M;
-}): IServiceAudience<M>;
+    createServiceMember: (audienceMember: IClient) => TMember;
+}): IServiceAudience<TMember>;
 
 // @public
 export type DataObjectClass<T extends IFluidLoadable> = {
@@ -53,7 +56,7 @@ export interface IConnection {
 
 // @public @sealed
 export interface IFluidContainer<TContainerSchema extends ContainerSchema = ContainerSchema> extends IEventProvider<IFluidContainerEvents> {
-    attach(): Promise<string>;
+    attach(props?: ContainerAttachProps): Promise<string>;
     readonly attachState: AttachState;
     connect(): void;
     readonly connectionState: ConnectionState;
@@ -114,10 +117,10 @@ export interface IServiceAudienceEvents<M extends IMember> extends IEvent {
 }
 
 // @public
-export type LoadableObjectClass<T extends IFluidLoadable> = DataObjectClass<T> | SharedObjectClass<T>;
+export type LoadableObjectClass<T extends IFluidLoadable = IFluidLoadable> = SharedObjectClass<T> | DataObjectClass<T>;
 
 // @public
-export type LoadableObjectClassRecord = Record<string, LoadableObjectClass<any>>;
+export type LoadableObjectClassRecord = Record<string, LoadableObjectClass>;
 
 // @public
 export type LoadableObjectCtor<T extends IFluidLoadable> = new (...args: any[]) => T;
@@ -134,8 +137,8 @@ export type Myself<M extends IMember = IMember> = M & {
 };
 
 // @public
-export type SharedObjectClass<T extends IFluidLoadable> = {
-    readonly getFactory: () => IChannelFactory;
-} & LoadableObjectCtor<T>;
+export interface SharedObjectClass<T extends IFluidLoadable> {
+    readonly getFactory: () => IChannelFactory<T>;
+}
 
 ```

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

@@ -15,6 +15,12 @@ import { IEventProvider } from '@fluidframework/core-interfaces';
 import { IFluidLoadable } from '@fluidframework/core-interfaces';
 import { IRuntimeFactory } from '@fluidframework/container-definitions';
 
+/**
+ * Represents properties that can be attached to a container.
+ * @public
+ */
+export declare type ContainerAttachProps<T = unknown> = T;
+
 /**
  * Declares the Fluid objects that will be available in the {@link IFluidContainer | Container}.
  *
@@ -43,7 +49,7 @@ export declare interface ContainerSchema {
      * }
      * ```
      */
-    initialObjects: LoadableObjectClassRecord;
+    readonly initialObjects: LoadableObjectClassRecord;
     /**
      * Loadable objects that can be created after the initial {@link IFluidContainer | Container} creation.
      *
@@ -54,7 +60,7 @@ export declare interface ContainerSchema {
      * For best practice it's recommended to define all the dynamic types you create even if they are
      * included via initialObjects.
      */
-    dynamicObjectTypes?: LoadableObjectClass<any>[];
+    readonly dynamicObjectTypes?: readonly LoadableObjectClass[];
 }
 
 /* Excluded from this release type: createDOProviderContainerRuntimeFactory */
@@ -100,6 +106,7 @@ export declare interface IConnection {
  * @typeparam TContainerSchema - Used to determine the type of 'initialObjects'.
  *
  * @remarks Note: external implementations of this interface are not supported.
+ *
  * @sealed
  * @public
  */
@@ -161,7 +168,7 @@ export declare interface IFluidContainer<TContainerSchema extends ContainerSchem
      *
      * @returns A promise which resolves when the attach is complete, with the string identifier of the container.
      */
-    attach(): Promise<string>;
+    attach(props?: ContainerAttachProps): Promise<string>;
     /**
      * Attempts to connect the container to the delta stream and process operations.
      *
@@ -170,7 +177,7 @@ export declare interface IFluidContainer<TContainerSchema extends ContainerSchem
      * @remarks
      *
      * This should only be called when the container is in the
-     * {@link @fluidframework/container-definitions#ConnectionState.Disconnected} state.
+     * {@link @fluidframework/container-definitions#(ConnectionState:namespace).Disconnected} state.
      *
      * This can be determined by observing {@link IFluidContainer.connectionState}.
      */
@@ -181,7 +188,7 @@ export declare interface IFluidContainer<TContainerSchema extends ContainerSchem
      * @remarks
      *
      * This should only be called when the container is in the
-     * {@link @fluidframework/container-definitions#ConnectionState.Connected} state.
+     * {@link @fluidframework/container-definitions#(ConnectionState:namespace).Connected} state.
      *
      * This can be determined by observing {@link IFluidContainer.connectionState}.
      */
@@ -355,15 +362,22 @@ export declare interface IServiceAudienceEvents<M extends IMember> extends IEven
  *
  * @typeParam T - The class of the `DataObject` or `SharedObject`.
  * @public
+ *
+ * @privateRemarks
+ * 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.
+ * This is likely (a bug in TypeScript)[https://github.com/microsoft/TypeScript/issues/45809].
  */
-export declare type LoadableObjectClass<T extends IFluidLoadable> = DataObjectClass<T> | SharedObjectClass<T>;
+export declare type LoadableObjectClass<T extends IFluidLoadable = IFluidLoadable> = SharedObjectClass<T> | DataObjectClass<T>;
 
 /**
  * A mapping of string identifiers to classes that will later be used to instantiate a corresponding `DataObject`
- * or `SharedObject` in a {@link LoadableObjectRecord}.
+ * or `SharedObject`.
  * @public
  */
-export declare type LoadableObjectClassRecord = Record<string, LoadableObjectClass<any>>;
+export declare type LoadableObjectClassRecord = Record<string, LoadableObjectClass>;
 
 /**
  * An object with a constructor that will return an {@link @fluidframework/core-interfaces#IFluidLoadable}.
@@ -395,14 +409,16 @@ export declare type Myself<M extends IMember = IMember> = M & {
 };
 
 /**
- * A class that has a factory that can create a DDSes (`SharedObject`s) and a
- * constructor that will return the type of the `DataObject`.
+ * A factory that produces a factory that can create a DDSes (`SharedObject`s).
  *
  * @typeParam T - The class of the `SharedObject`.
  * @public
  */
-export declare type SharedObjectClass<T extends IFluidLoadable> = {
-    readonly getFactory: () => IChannelFactory;
-} & LoadableObjectCtor<T>;
+export declare interface SharedObjectClass<T extends IFluidLoadable> {
+    /**
+     * Gets the factory this factory is a wrapper for.
+     */
+    readonly getFactory: () => IChannelFactory<T>;
+}
 
 export { }

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

@@ -15,6 +15,12 @@ import { IEventProvider } from '@fluidframework/core-interfaces';
 import { IFluidLoadable } from '@fluidframework/core-interfaces';
 import { IRuntimeFactory } from '@fluidframework/container-definitions';
 
+/**
+ * Represents properties that can be attached to a container.
+ * @public
+ */
+export declare type ContainerAttachProps<T = unknown> = T;
+
 /**
  * Declares the Fluid objects that will be available in the {@link IFluidContainer | Container}.
  *
@@ -43,7 +49,7 @@ export declare interface ContainerSchema {
      * }
      * ```
      */
-    initialObjects: LoadableObjectClassRecord;
+    readonly initialObjects: LoadableObjectClassRecord;
     /**
      * Loadable objects that can be created after the initial {@link IFluidContainer | Container} creation.
      *
@@ -54,7 +60,7 @@ export declare interface ContainerSchema {
      * For best practice it's recommended to define all the dynamic types you create even if they are
      * included via initialObjects.
      */
-    dynamicObjectTypes?: LoadableObjectClass<any>[];
+    readonly dynamicObjectTypes?: readonly LoadableObjectClass[];
 }
 
 /* Excluded from this release type: createDOProviderContainerRuntimeFactory */
@@ -102,6 +108,7 @@ export declare interface IConnection {
  * @typeparam TContainerSchema - Used to determine the type of 'initialObjects'.
  *
  * @remarks Note: external implementations of this interface are not supported.
+ *
  * @sealed
  * @public
  */
@@ -163,7 +170,7 @@ export declare interface IFluidContainer<TContainerSchema extends ContainerSchem
      *
      * @returns A promise which resolves when the attach is complete, with the string identifier of the container.
      */
-    attach(): Promise<string>;
+    attach(props?: ContainerAttachProps): Promise<string>;
     /**
      * Attempts to connect the container to the delta stream and process operations.
      *
@@ -172,7 +179,7 @@ export declare interface IFluidContainer<TContainerSchema extends ContainerSchem
      * @remarks
      *
      * This should only be called when the container is in the
-     * {@link @fluidframework/container-definitions#ConnectionState.Disconnected} state.
+     * {@link @fluidframework/container-definitions#(ConnectionState:namespace).Disconnected} state.
      *
      * This can be determined by observing {@link IFluidContainer.connectionState}.
      */
@@ -183,7 +190,7 @@ export declare interface IFluidContainer<TContainerSchema extends ContainerSchem
      * @remarks
      *
      * This should only be called when the container is in the
-     * {@link @fluidframework/container-definitions#ConnectionState.Connected} state.
+     * {@link @fluidframework/container-definitions#(ConnectionState:namespace).Connected} state.
      *
      * This can be determined by observing {@link IFluidContainer.connectionState}.
      */
@@ -359,15 +366,22 @@ export declare interface IServiceAudienceEvents<M extends IMember> extends IEven
  *
  * @typeParam T - The class of the `DataObject` or `SharedObject`.
  * @public
+ *
+ * @privateRemarks
+ * 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.
+ * This is likely (a bug in TypeScript)[https://github.com/microsoft/TypeScript/issues/45809].
  */
-export declare type LoadableObjectClass<T extends IFluidLoadable> = DataObjectClass<T> | SharedObjectClass<T>;
+export declare type LoadableObjectClass<T extends IFluidLoadable = IFluidLoadable> = SharedObjectClass<T> | DataObjectClass<T>;
 
 /**
  * A mapping of string identifiers to classes that will later be used to instantiate a corresponding `DataObject`
- * or `SharedObject` in a {@link LoadableObjectRecord}.
+ * or `SharedObject`.
  * @public
  */
-export declare type LoadableObjectClassRecord = Record<string, LoadableObjectClass<any>>;
+export declare type LoadableObjectClassRecord = Record<string, LoadableObjectClass>;
 
 /**
  * An object with a constructor that will return an {@link @fluidframework/core-interfaces#IFluidLoadable}.
@@ -399,14 +413,16 @@ export declare type Myself<M extends IMember = IMember> = M & {
 };
 
 /**
- * A class that has a factory that can create a DDSes (`SharedObject`s) and a
- * constructor that will return the type of the `DataObject`.
+ * A factory that produces a factory that can create a DDSes (`SharedObject`s).
  *
  * @typeParam T - The class of the `SharedObject`.
  * @public
  */
-export declare type SharedObjectClass<T extends IFluidLoadable> = {
-    readonly getFactory: () => IChannelFactory;
-} & LoadableObjectCtor<T>;
+export declare interface SharedObjectClass<T extends IFluidLoadable> {
+    /**
+     * Gets the factory this factory is a wrapper for.
+     */
+    readonly getFactory: () => IChannelFactory<T>;
+}
 
 export { }

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

@@ -15,6 +15,12 @@ import { IEventProvider } from '@fluidframework/core-interfaces';
 import { IFluidLoadable } from '@fluidframework/core-interfaces';
 import { IRuntimeFactory } from '@fluidframework/container-definitions';
 
+/**
+ * Represents properties that can be attached to a container.
+ * @public
+ */
+export declare type ContainerAttachProps<T = unknown> = T;
+
 /**
  * Declares the Fluid objects that will be available in the {@link IFluidContainer | Container}.
  *
@@ -43,7 +49,7 @@ export declare interface ContainerSchema {
      * }
      * ```
      */
-    initialObjects: LoadableObjectClassRecord;
+    readonly initialObjects: LoadableObjectClassRecord;
     /**
      * Loadable objects that can be created after the initial {@link IFluidContainer | Container} creation.
      *
@@ -54,7 +60,7 @@ export declare interface ContainerSchema {
      * For best practice it's recommended to define all the dynamic types you create even if they are
      * included via initialObjects.
      */
-    dynamicObjectTypes?: LoadableObjectClass<any>[];
+    readonly dynamicObjectTypes?: readonly LoadableObjectClass[];
 }
 
 /* Excluded from this release type: createDOProviderContainerRuntimeFactory */
@@ -102,6 +108,7 @@ export declare interface IConnection {
  * @typeparam TContainerSchema - Used to determine the type of 'initialObjects'.
  *
  * @remarks Note: external implementations of this interface are not supported.
+ *
  * @sealed
  * @public
  */
@@ -163,7 +170,7 @@ export declare interface IFluidContainer<TContainerSchema extends ContainerSchem
      *
      * @returns A promise which resolves when the attach is complete, with the string identifier of the container.
      */
-    attach(): Promise<string>;
+    attach(props?: ContainerAttachProps): Promise<string>;
     /**
      * Attempts to connect the container to the delta stream and process operations.
      *
@@ -172,7 +179,7 @@ export declare interface IFluidContainer<TContainerSchema extends ContainerSchem
      * @remarks
      *
      * This should only be called when the container is in the
-     * {@link @fluidframework/container-definitions#ConnectionState.Disconnected} state.
+     * {@link @fluidframework/container-definitions#(ConnectionState:namespace).Disconnected} state.
      *
      * This can be determined by observing {@link IFluidContainer.connectionState}.
      */
@@ -183,7 +190,7 @@ export declare interface IFluidContainer<TContainerSchema extends ContainerSchem
      * @remarks
      *
      * This should only be called when the container is in the
-     * {@link @fluidframework/container-definitions#ConnectionState.Connected} state.
+     * {@link @fluidframework/container-definitions#(ConnectionState:namespace).Connected} state.
      *
      * This can be determined by observing {@link IFluidContainer.connectionState}.
      */
@@ -359,15 +366,22 @@ export declare interface IServiceAudienceEvents<M extends IMember> extends IEven
  *
  * @typeParam T - The class of the `DataObject` or `SharedObject`.
  * @public
+ *
+ * @privateRemarks
+ * 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.
+ * This is likely (a bug in TypeScript)[https://github.com/microsoft/TypeScript/issues/45809].
  */
-export declare type LoadableObjectClass<T extends IFluidLoadable> = DataObjectClass<T> | SharedObjectClass<T>;
+export declare type LoadableObjectClass<T extends IFluidLoadable = IFluidLoadable> = SharedObjectClass<T> | DataObjectClass<T>;
 
 /**
  * A mapping of string identifiers to classes that will later be used to instantiate a corresponding `DataObject`
- * or `SharedObject` in a {@link LoadableObjectRecord}.
+ * or `SharedObject`.
  * @public
  */
-export declare type LoadableObjectClassRecord = Record<string, LoadableObjectClass<any>>;
+export declare type LoadableObjectClassRecord = Record<string, LoadableObjectClass>;
 
 /**
  * An object with a constructor that will return an {@link @fluidframework/core-interfaces#IFluidLoadable}.
@@ -399,14 +413,16 @@ export declare type Myself<M extends IMember = IMember> = M & {
 };
 
 /**
- * A class that has a factory that can create a DDSes (`SharedObject`s) and a
- * constructor that will return the type of the `DataObject`.
+ * A factory that produces a factory that can create a DDSes (`SharedObject`s).
  *
  * @typeParam T - The class of the `SharedObject`.
  * @public
  */
-export declare type SharedObjectClass<T extends IFluidLoadable> = {
-    readonly getFactory: () => IChannelFactory;
-} & LoadableObjectCtor<T>;
+export declare interface SharedObjectClass<T extends IFluidLoadable> {
+    /**
+     * Gets the factory this factory is a wrapper for.
+     */
+    readonly getFactory: () => IChannelFactory<T>;
+}
 
 export { }

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

@@ -15,6 +15,12 @@ import { IEventProvider } from '@fluidframework/core-interfaces';
 import { IFluidLoadable } from '@fluidframework/core-interfaces';
 import { IRuntimeFactory } from '@fluidframework/container-definitions';
 
+/**
+ * Represents properties that can be attached to a container.
+ * @public
+ */
+export declare type ContainerAttachProps<T = unknown> = T;
+
 /**
  * Declares the Fluid objects that will be available in the {@link IFluidContainer | Container}.
  *
@@ -43,7 +49,7 @@ export declare interface ContainerSchema {
      * }
      * ```
      */
-    initialObjects: LoadableObjectClassRecord;
+    readonly initialObjects: LoadableObjectClassRecord;
     /**
      * Loadable objects that can be created after the initial {@link IFluidContainer | Container} creation.
      *
@@ -54,10 +60,13 @@ export declare interface ContainerSchema {
      * For best practice it's recommended to define all the dynamic types you create even if they are
      * included via initialObjects.
      */
-    dynamicObjectTypes?: LoadableObjectClass<any>[];
+    readonly dynamicObjectTypes?: readonly LoadableObjectClass[];
 }
 
 /**
+ * Creates an {@link @fluidframework/aqueduct#BaseContainerRuntimeFactory} for a container with a single
+ * {@link IRootDataObject}, which is constructed from the provided schema.
+ *
  * @internal
  */
 export declare function createDOProviderContainerRuntimeFactory(props: {
@@ -65,6 +74,8 @@ export declare function createDOProviderContainerRuntimeFactory(props: {
 }): IRuntimeFactory;
 
 /**
+ * Creates an {@link IFluidContainer} from the provided `container` and `rootDataObject`.
+ *
  * @internal
  */
 export declare function createFluidContainer<TContainerSchema extends ContainerSchema = ContainerSchema>(props: {
@@ -73,12 +84,19 @@ export declare function createFluidContainer<TContainerSchema extends ContainerS
 }): IFluidContainer<TContainerSchema>;
 
 /**
+ * Creates a service audience for the provided container.
+ *
+ * @param container - The container with which the audience is associated.
+ * @param createServiceMember - A function for creating audience members.
+ *
+ * @typeParam TMember - The {@link IMember} representation used by the audience.
+ *
  * @internal
  */
-export declare function createServiceAudience<M extends IMember = IMember>(props: {
+export declare function createServiceAudience<TMember extends IMember = IMember>(props: {
     container: IContainer;
-    createServiceMember: (audienceMember: IClient) => M;
-}): IServiceAudience<M>;
+    createServiceMember: (audienceMember: IClient) => TMember;
+}): IServiceAudience<TMember>;
 
 /**
  * A class that has a factory that can create a `DataObject` and a
@@ -117,6 +135,7 @@ export declare interface IConnection {
  * @typeparam TContainerSchema - Used to determine the type of 'initialObjects'.
  *
  * @remarks Note: external implementations of this interface are not supported.
+ *
  * @sealed
  * @public
  */
@@ -178,7 +197,7 @@ export declare interface IFluidContainer<TContainerSchema extends ContainerSchem
      *
      * @returns A promise which resolves when the attach is complete, with the string identifier of the container.
      */
-    attach(): Promise<string>;
+    attach(props?: ContainerAttachProps): Promise<string>;
     /**
      * Attempts to connect the container to the delta stream and process operations.
      *
@@ -187,7 +206,7 @@ export declare interface IFluidContainer<TContainerSchema extends ContainerSchem
      * @remarks
      *
      * This should only be called when the container is in the
-     * {@link @fluidframework/container-definitions#ConnectionState.Disconnected} state.
+     * {@link @fluidframework/container-definitions#(ConnectionState:namespace).Disconnected} state.
      *
      * This can be determined by observing {@link IFluidContainer.connectionState}.
      */
@@ -198,7 +217,7 @@ export declare interface IFluidContainer<TContainerSchema extends ContainerSchem
      * @remarks
      *
      * This should only be called when the container is in the
-     * {@link @fluidframework/container-definitions#ConnectionState.Connected} state.
+     * {@link @fluidframework/container-definitions#(ConnectionState:namespace).Connected} state.
      *
      * This can be determined by observing {@link IFluidContainer.connectionState}.
      */
@@ -395,15 +414,22 @@ export declare interface IServiceAudienceEvents<M extends IMember> extends IEven
  *
  * @typeParam T - The class of the `DataObject` or `SharedObject`.
  * @public
+ *
+ * @privateRemarks
+ * 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.
+ * This is likely (a bug in TypeScript)[https://github.com/microsoft/TypeScript/issues/45809].
  */
-export declare type LoadableObjectClass<T extends IFluidLoadable> = DataObjectClass<T> | SharedObjectClass<T>;
+export declare type LoadableObjectClass<T extends IFluidLoadable = IFluidLoadable> = SharedObjectClass<T> | DataObjectClass<T>;
 
 /**
  * A mapping of string identifiers to classes that will later be used to instantiate a corresponding `DataObject`
- * or `SharedObject` in a {@link LoadableObjectRecord}.
+ * or `SharedObject`.
  * @public
  */
-export declare type LoadableObjectClassRecord = Record<string, LoadableObjectClass<any>>;
+export declare type LoadableObjectClassRecord = Record<string, LoadableObjectClass>;
 
 /**
  * An object with a constructor that will return an {@link @fluidframework/core-interfaces#IFluidLoadable}.
@@ -439,14 +465,16 @@ export declare type Myself<M extends IMember = IMember> = M & {
 };
 
 /**
- * A class that has a factory that can create a DDSes (`SharedObject`s) and a
- * constructor that will return the type of the `DataObject`.
+ * A factory that produces a factory that can create a DDSes (`SharedObject`s).
  *
  * @typeParam T - The class of the `SharedObject`.
  * @public
  */
-export declare type SharedObjectClass<T extends IFluidLoadable> = {
-    readonly getFactory: () => IChannelFactory;
-} & LoadableObjectCtor<T>;
+export declare interface SharedObjectClass<T extends IFluidLoadable> {
+    /**
+     * Gets the factory this factory is a wrapper for.
+     */
+    readonly getFactory: () => IChannelFactory<T>;
+}
 
 export { }

package/dist/fluidContainer.d.ts

@@ -1,6 +1,6 @@
-import { IEvent, IEventProvider, IFluidLoadable } from "@fluidframework/core-interfaces";
-import { AttachState, IContainer, ICriticalContainerError, ConnectionState } from "@fluidframework/container-definitions";
-import type { ContainerSchema, IRootDataObject, LoadableObjectClass } from "./types";
+import { type IEvent, type IEventProvider, type IFluidLoadable } from "@fluidframework/core-interfaces";
+import { AttachState, type IContainer, type ICriticalContainerError, type ConnectionState } from "@fluidframework/container-definitions";
+import type { ContainerSchema, ContainerAttachProps, IRootDataObject, LoadableObjectClass } from "./types.js";
 /**
  * Extract the type of 'initialObjects' from the given {@link ContainerSchema} type.
  * @public
@@ -73,6 +73,7 @@ export interface IFluidContainerEvents extends IEvent {
  * @typeparam TContainerSchema - Used to determine the type of 'initialObjects'.
  *
  * @remarks Note: external implementations of this interface are not supported.
+ *
  * @sealed
  * @public
  */
@@ -134,7 +135,7 @@ export interface IFluidContainer<TContainerSchema extends ContainerSchema = Cont
      *
      * @returns A promise which resolves when the attach is complete, with the string identifier of the container.
      */
-    attach(): Promise<string>;
+    attach(props?: ContainerAttachProps): Promise<string>;
     /**
      * Attempts to connect the container to the delta stream and process operations.
      *
@@ -143,7 +144,7 @@ export interface IFluidContainer<TContainerSchema extends ContainerSchema = Cont
      * @remarks
      *
      * This should only be called when the container is in the
-     * {@link @fluidframework/container-definitions#ConnectionState.Disconnected} state.
+     * {@link @fluidframework/container-definitions#(ConnectionState:namespace).Disconnected} state.
      *
      * This can be determined by observing {@link IFluidContainer.connectionState}.
      */
@@ -154,7 +155,7 @@ export interface IFluidContainer<TContainerSchema extends ContainerSchema = Cont
      * @remarks
      *
      * This should only be called when the container is in the
-     * {@link @fluidframework/container-definitions#ConnectionState.Connected} state.
+     * {@link @fluidframework/container-definitions#(ConnectionState:namespace).Connected} state.
      *
      * This can be determined by observing {@link IFluidContainer.connectionState}.
      */
@@ -179,6 +180,8 @@ export interface IFluidContainer<TContainerSchema extends ContainerSchema = Cont
     dispose(): void;
 }
 /**
+ * Creates an {@link IFluidContainer} from the provided `container` and `rootDataObject`.
+ *
  * @internal
  */
 export declare function createFluidContainer<TContainerSchema extends ContainerSchema = ContainerSchema>(props: {