@fluidframework/container-runtime 2.70.0-361788 → 2.71.0

package/src/dataStoreContext.ts

@@ -41,34 +41,37 @@ import {
 	readAndParse,
 } from "@fluidframework/driver-utils/internal";
 import type { IIdCompressor } from "@fluidframework/id-compressor";
-import {
-	type ISummaryTreeWithStats,
-	type ITelemetryContext,
-	type IGarbageCollectionData,
-	type CreateChildSummarizerNodeFn,
-	type CreateChildSummarizerNodeParam,
-	type FluidDataStoreRegistryEntry,
-	type IContainerRuntimeBase,
-	type IDataStore,
-	type IFluidDataStoreChannel,
-	type IFluidDataStoreContext,
-	type IFluidDataStoreContextDetached,
-	type IFluidDataStoreRegistry,
-	type IGarbageCollectionDetailsBase,
-	type IProvideFluidDataStoreFactory,
-	type ISummarizeInternalResult,
-	type ISummarizeResult,
-	type ISummarizerNodeWithGC,
-	type SummarizeInternalFn,
-	channelsTreeName,
-	type IInboundSignalMessage,
-	type IPendingMessagesState,
-	type IRuntimeMessageCollection,
-	type IFluidDataStoreFactory,
-	type PackagePath,
-	type IRuntimeStorageService,
-	type MinimumVersionForCollab,
+import type {
+	FluidDataStoreMessage,
+	ISummaryTreeWithStats,
+	ITelemetryContext,
+	IGarbageCollectionData,
+	CreateChildSummarizerNodeFn,
+	CreateChildSummarizerNodeParam,
+	FluidDataStoreContextInternal,
+	FluidDataStoreRegistryEntry,
+	IContainerRuntimeBase,
+	IDataStore,
+	IFluidDataStoreChannel,
+	IFluidDataStoreContextDetached,
+	IFluidDataStoreRegistry,
+	IGarbageCollectionDetailsBase,
+	IProvideFluidDataStoreFactory,
+	ISummarizeInternalResult,
+	ISummarizeResult,
+	ISummarizerNodeWithGC,
+	SummarizeInternalFn,
+	IInboundSignalMessage,
+	IPendingMessagesState,
+	IRuntimeMessageCollection,
+	IFluidDataStoreFactory,
+	PackagePath,
+	IRuntimeStorageService,
+	MinimumVersionForCollab,
+	ContainerExtensionId,
+	ContainerExtensionExpectations,
 } from "@fluidframework/runtime-definitions/internal";
+import { channelsTreeName } from "@fluidframework/runtime-definitions/internal";
 import {
 	addBlobToSummary,
 	isSnapshotFetchRequiredForLoadingGroupId,
@@ -133,7 +136,7 @@ export interface ISnapshotDetails {
  * This interface is used for context's parent - ChannelCollection.
  * It should not be exposed to any other users of context.
  */
-export interface IFluidDataStoreContextInternal extends IFluidDataStoreContext {
+export interface IFluidDataStoreContextPrivate extends FluidDataStoreContextInternal {
 	getAttachSummary(telemetryContext?: ITelemetryContext): ISummaryTreeWithStats;
 
 	getAttachGCData(telemetryContext?: ITelemetryContext): IGarbageCollectionData;
@@ -248,11 +251,7 @@ class ContextDeltaManagerProxy extends BaseDeltaManagerProxy {
  */
 export abstract class FluidDataStoreContext
 	extends TypedEventEmitter<IFluidDataStoreContextEvents>
-	implements
-		IFluidDataStoreContextInternal,
-		IFluidDataStoreContext,
-		IDisposable,
-		IProvideLayerCompatDetails
+	implements IFluidDataStoreContextPrivate, IDisposable, IProvideLayerCompatDetails
 {
 	public get packagePath(): PackagePath {
 		assert(this.pkg !== undefined, 0x139 /* "Undefined package path" */);
@@ -1095,23 +1094,22 @@ export abstract class FluidDataStoreContext
 	}
 
 	public reSubmit(
-		type: string,
-		contents: unknown,
+		message: FluidDataStoreMessage,
 		localOpMetadata: unknown,
-		squash: boolean,
+		squash?: boolean,
 	): void {
 		assert(!!this.channel, 0x14b /* "Channel must exist when resubmitting ops" */);
-		this.channel.reSubmit(type, contents, localOpMetadata, squash);
+		this.channel.reSubmit(message.type, message.content, localOpMetadata, squash);
 	}
 
-	public rollback(type: string, contents: unknown, localOpMetadata: unknown): void {
+	public rollback(message: FluidDataStoreMessage, localOpMetadata: unknown): void {
 		if (!this.channel) {
 			throw new Error("Channel must exist when rolling back ops");
 		}
 		if (!this.channel.rollback) {
 			throw new Error("Channel doesn't support rollback");
 		}
-		this.channel.rollback(type, contents, localOpMetadata);
+		this.channel.rollback(message.type, message.content, localOpMetadata);
 	}
 
 	public async applyStashedOp(contents: unknown): Promise<unknown> {
@@ -1222,6 +1220,14 @@ export abstract class FluidDataStoreContext
 	): Promise<IFluidHandleInternal<ArrayBufferLike>> {
 		return this.parentContext.uploadBlob(blob, signal);
 	}
+
+	public getExtension<TInterface, TUseContext extends unknown[] = []>(
+		id: ContainerExtensionId,
+		requirements: ContainerExtensionExpectations,
+		...context: TUseContext
+	): TInterface {
+		return this.parentContext.getExtension(id, requirements, ...context);
+	}
 }
 
 /**

package/src/index.ts

@@ -20,11 +20,16 @@ export {
 } from "./containerRuntime.js";
 export type { ICompressionRuntimeOptions } from "./compressionDefinitions.js";
 export { CompressionAlgorithms, disabledCompressionConfig } from "./compressionDefinitions.js";
-export {
-	ContainerMessageType,
-	type UnknownContainerRuntimeMessage,
+export type {
+	ContainerRuntimeAliasMessage,
+	ContainerRuntimeDataStoreOpMessage,
+	OutboundContainerRuntimeAttachMessage,
+	TypedContainerRuntimeMessage,
+	UnknownContainerRuntimeMessage,
 } from "./messageTypes.js";
+export { ContainerMessageType } from "./messageTypes.js";
 export type { IBlobManagerLoadInfo } from "./blobManager/index.js";
+export type { IDataStoreAliasMessage } from "./dataStore.js";
 export { FluidDataStoreRegistry } from "./dataStoreRegistry.js";
 export {
 	detectOutboundReferences,

package/src/messageTypes.ts

@@ -6,6 +6,7 @@
 import type { ISequencedDocumentMessage } from "@fluidframework/driver-definitions/internal";
 import type { IdCreationRange } from "@fluidframework/id-compressor/internal";
 import type {
+	FluidDataStoreMessage,
 	IAttachMessage,
 	IEnvelope,
 	InboundAttachMessage,
@@ -66,8 +67,10 @@ export enum ContainerMessageType {
  *
  * IMPORTANT: when creating one to be serialized, set the properties in the order they appear here.
  * This way stringified values can be compared.
+ *
+ * @internal
  */
-interface TypedContainerRuntimeMessage<TType extends ContainerMessageType, TContents> {
+export interface TypedContainerRuntimeMessage<TType extends ContainerMessageType, TContents> {
 	/**
 	 * Type of the op, within the ContainerRuntime's domain
 	 */
@@ -78,14 +81,22 @@ interface TypedContainerRuntimeMessage<TType extends ContainerMessageType, TCont
 	contents: TContents;
 }
 
+/**
+ * @internal
+ * @privateRemarks exported per ContainerRuntime export for testing purposes
+ */
 export type ContainerRuntimeDataStoreOpMessage = TypedContainerRuntimeMessage<
 	ContainerMessageType.FluidDataStoreOp,
-	IEnvelope
+	IEnvelope<FluidDataStoreMessage>
 >;
 export type InboundContainerRuntimeAttachMessage = TypedContainerRuntimeMessage<
 	ContainerMessageType.Attach,
 	InboundAttachMessage
 >;
+/**
+ * @internal
+ * @privateRemarks exported per ContainerRuntime export for testing purposes
+ */
 export type OutboundContainerRuntimeAttachMessage = TypedContainerRuntimeMessage<
 	ContainerMessageType.Attach,
 	IAttachMessage
@@ -102,6 +113,10 @@ export type ContainerRuntimeRejoinMessage = TypedContainerRuntimeMessage<
 	ContainerMessageType.Rejoin,
 	undefined
 >;
+/**
+ * @internal
+ * @privateRemarks exported per ContainerRuntime export for testing purposes
+ */
 export type ContainerRuntimeAliasMessage = TypedContainerRuntimeMessage<
 	ContainerMessageType.Alias,
 	IDataStoreAliasMessage

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/container-runtime";
-export const pkgVersion = "2.70.0-361788";
+export const pkgVersion = "2.71.0";

package/src/runtimeLayerCompatState.ts

@@ -32,7 +32,7 @@ export const runtimeCoreCompatDetails = {
 	 * The current generation of the Runtime layer.
 	 */
 	generation: 1,
-};
+} as const;
 
 /**
  * Runtime's compatibility details that is exposed to the Loader layer.

package/src/summary/summarizerNode/summarizerNode.ts

@@ -104,6 +104,7 @@ export class SummarizerNode implements IRootSummarizerNode {
 		 * Encoded handle or path to the node
 		 */
 		private readonly _summaryHandleId: string,
+		// eslint-disable-next-line @typescript-eslint/prefer-readonly
 		private _changeSequenceNumber: number,
 		/**
 		 * Summary reference sequence number, i.e. last sequence number seen when last successful summary was created