@fluidframework/datastore 2.0.0-internal.4.0.6 → 2.0.0-internal.4.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/datastore",
-  "version": "2.0.0-internal.4.0.6",
+  "version": "2.0.0-internal.4.1.0",
   "description": "Fluid data store implementation",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -37,29 +37,29 @@
   "dependencies": {
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/common-utils": "^1.1.1",
-    "@fluidframework/container-definitions": ">=2.0.0-internal.4.0.6 <2.0.0-internal.5.0.0",
-    "@fluidframework/container-utils": ">=2.0.0-internal.4.0.6 <2.0.0-internal.5.0.0",
-    "@fluidframework/core-interfaces": ">=2.0.0-internal.4.0.6 <2.0.0-internal.5.0.0",
-    "@fluidframework/datastore-definitions": ">=2.0.0-internal.4.0.6 <2.0.0-internal.5.0.0",
-    "@fluidframework/driver-definitions": ">=2.0.0-internal.4.0.6 <2.0.0-internal.5.0.0",
-    "@fluidframework/driver-utils": ">=2.0.0-internal.4.0.6 <2.0.0-internal.5.0.0",
-    "@fluidframework/garbage-collector": ">=2.0.0-internal.4.0.6 <2.0.0-internal.5.0.0",
-    "@fluidframework/protocol-base": "^0.1038.4000",
+    "@fluidframework/container-definitions": ">=2.0.0-internal.4.1.0 <2.0.0-internal.4.2.0",
+    "@fluidframework/container-utils": ">=2.0.0-internal.4.1.0 <2.0.0-internal.4.2.0",
+    "@fluidframework/core-interfaces": ">=2.0.0-internal.4.1.0 <2.0.0-internal.4.2.0",
+    "@fluidframework/datastore-definitions": ">=2.0.0-internal.4.1.0 <2.0.0-internal.4.2.0",
+    "@fluidframework/driver-definitions": ">=2.0.0-internal.4.1.0 <2.0.0-internal.4.2.0",
+    "@fluidframework/driver-utils": ">=2.0.0-internal.4.1.0 <2.0.0-internal.4.2.0",
+    "@fluidframework/garbage-collector": ">=2.0.0-internal.4.1.0 <2.0.0-internal.4.2.0",
+    "@fluidframework/protocol-base": "^0.1039.1000",
     "@fluidframework/protocol-definitions": "^1.1.0",
-    "@fluidframework/runtime-definitions": ">=2.0.0-internal.4.0.6 <2.0.0-internal.5.0.0",
-    "@fluidframework/runtime-utils": ">=2.0.0-internal.4.0.6 <2.0.0-internal.5.0.0",
-    "@fluidframework/telemetry-utils": ">=2.0.0-internal.4.0.6 <2.0.0-internal.5.0.0",
+    "@fluidframework/runtime-definitions": ">=2.0.0-internal.4.1.0 <2.0.0-internal.4.2.0",
+    "@fluidframework/runtime-utils": ">=2.0.0-internal.4.1.0 <2.0.0-internal.4.2.0",
+    "@fluidframework/telemetry-utils": ">=2.0.0-internal.4.1.0 <2.0.0-internal.4.2.0",
     "lodash": "^4.17.21",
     "uuid": "^8.3.1"
   },
   "devDependencies": {
-    "@fluid-tools/build-cli": "^0.13.0",
+    "@fluid-tools/build-cli": "^0.15.0",
     "@fluidframework/build-common": "^1.1.0",
-    "@fluidframework/build-tools": "^0.13.0",
+    "@fluidframework/build-tools": "^0.15.0",
     "@fluidframework/datastore-previous": "npm:@fluidframework/datastore@2.0.0-internal.4.0.0",
     "@fluidframework/eslint-config-fluid": "^2.0.0",
-    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.4.0.6 <2.0.0-internal.5.0.0",
-    "@fluidframework/test-runtime-utils": ">=2.0.0-internal.4.0.6 <2.0.0-internal.5.0.0",
+    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.4.1.0 <2.0.0-internal.4.2.0",
+    "@fluidframework/test-runtime-utils": ">=2.0.0-internal.4.1.0 <2.0.0-internal.4.2.0",
     "@microsoft/api-extractor": "^7.34.4",
     "@types/mocha": "^9.1.1",
     "@types/node": "^14.18.38",
@@ -69,6 +69,9 @@
     "cross-env": "^7.0.3",
     "eslint": "~8.6.0",
     "mocha": "^10.2.0",
+    "mocha-json-output-reporter": "^2.0.1",
+    "mocha-multi-reporters": "^1.5.1",
+    "moment": "^2.21.0",
     "nyc": "^15.1.0",
     "prettier": "~2.6.2",
     "rimraf": "^4.4.0",
@@ -99,6 +102,7 @@
     "test": "npm run test:mocha",
     "test:coverage": "nyc npm test -- --reporter xunit --reporter-option output=nyc/junit-report.xml",
     "test:mocha": "mocha --ignore 'dist/test/types/*' --recursive dist/test --exit -r node_modules/@fluidframework/mocha-test-setup --unhandled-rejections=strict",
+    "test:mocha:multireport": "cross-env FLUID_TEST_MULTIREPORT=1 npm run test:mocha",
     "test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
     "tsc": "tsc",
     "tsc:watch": "tsc --watch",

package/src/channelContext.ts

@@ -10,6 +10,7 @@ import { IDocumentStorageService } from "@fluidframework/driver-definitions";
 import { ISequencedDocumentMessage, ISnapshotTree } from "@fluidframework/protocol-definitions";
 import {
 	IGarbageCollectionData,
+	IExperimentalIncrementalSummaryContext,
 	ISummarizeResult,
 	ISummaryTreeWithStats,
 	ITelemetryContext,
@@ -99,8 +100,14 @@ export async function summarizeChannelAsync(
 	fullTree: boolean = false,
 	trackState: boolean = false,
 	telemetryContext?: ITelemetryContext,
+	incrementalSummaryContext?: IExperimentalIncrementalSummaryContext,
 ): Promise<ISummaryTreeWithStats> {
-	const summarizeResult = await channel.summarize(fullTree, trackState, telemetryContext);
+	const summarizeResult = await channel.summarize(
+		fullTree,
+		trackState,
+		telemetryContext,
+		incrementalSummaryContext,
+	);
 
 	// Add the channel attributes to the returned result.
 	addBlobToSummary(summarizeResult, attributesBlobKey, JSON.stringify(channel.attributes));

package/src/dataStoreRuntime.ts

@@ -65,8 +65,10 @@ import {
 	create404Response,
 	createResponseError,
 	exceptionToResponse,
+	GCDataBuilder,
 	requestFluidObject,
 	packagePathToTelemetryProperty,
+	unpackChildNodesUsedRoutes,
 } from "@fluidframework/runtime-utils";
 import {
 	IChannel,
@@ -74,7 +76,6 @@ import {
 	IFluidDataStoreRuntimeEvents,
 	IChannelFactory,
 } from "@fluidframework/datastore-definitions";
-import { GCDataBuilder, unpackChildNodesUsedRoutes } from "@fluidframework/garbage-collector";
 import { v4 as uuid } from "uuid";
 import { IChannelContext, summarizeChannel } from "./channelContext";
 import {

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/datastore";
-export const pkgVersion = "2.0.0-internal.4.0.6";
+export const pkgVersion = "2.0.0-internal.4.1.0";

package/src/remoteChannelContext.ts

@@ -11,7 +11,6 @@ import {
 	IChannel,
 	IChannelAttributes,
 	IFluidDataStoreRuntime,
-	IChannelFactory,
 } from "@fluidframework/datastore-definitions";
 import { IDocumentStorageService } from "@fluidframework/driver-definitions";
 import { readAndParse } from "@fluidframework/driver-utils";
@@ -20,6 +19,7 @@ import {
 	CreateChildSummarizerNodeFn,
 	IFluidDataStoreContext,
 	IGarbageCollectionData,
+	IExperimentalIncrementalSummaryContext,
 	ISummarizeInternalResult,
 	ISummarizeResult,
 	ISummarizerNodeWithGC,
@@ -84,7 +84,14 @@ export class RemoteChannelContext implements IChannelContext {
 			fullTree: boolean,
 			trackState: boolean,
 			telemetryContext?: ITelemetryContext,
-		) => this.summarizeInternal(fullTree, trackState, telemetryContext);
+			incrementalSummaryContext?: IExperimentalIncrementalSummaryContext,
+		) =>
+			this.summarizeInternal(
+				fullTree,
+				trackState,
+				telemetryContext,
+				incrementalSummaryContext,
+			);
 
 		this.summarizerNode = createSummarizerNode(
 			thisSummarizeInternal,
@@ -167,6 +174,7 @@ export class RemoteChannelContext implements IChannelContext {
 		fullTree: boolean,
 		trackState: boolean,
 		telemetryContext?: ITelemetryContext,
+		incrementalSummaryContext?: IExperimentalIncrementalSummaryContext,
 	): Promise<ISummarizeInternalResult> {
 		const channel = await this.getChannel();
 		const summarizeResult = await summarizeChannelAsync(
@@ -174,6 +182,7 @@ export class RemoteChannelContext implements IChannelContext {
 			fullTree,
 			trackState,
 			telemetryContext,
+			incrementalSummaryContext,
 		);
 		return { ...summarizeResult, id: this.id };
 	}
@@ -192,62 +201,45 @@ export class RemoteChannelContext implements IChannelContext {
 			);
 		}
 
-		let factory: IChannelFactory | undefined;
-		// this is a backward compatibility case where
-		// the attach message doesn't include
-		// the attributes. Since old attach messages
-		// will not have attributes we need to keep
-		// this as long as we support old attach messages
-		if (attributes === undefined) {
-			if (this.attachMessageType === undefined) {
-				// TODO: dataStoreId may require a different tag from PackageData #7488
-				throw new DataCorruptionError("channelTypeNotAvailable", {
-					channelId: {
-						value: this.id,
-						tag: TelemetryDataTag.CodeArtifact,
-					},
-					dataStoreId: {
-						value: this.dataStoreContext.id,
-						tag: TelemetryDataTag.CodeArtifact,
-					},
-					dataStorePackagePath: this.dataStoreContext.packagePath.join("/"),
-				});
-			}
-			factory = this.registry.get(this.attachMessageType);
-			if (factory === undefined) {
-				// TODO: dataStoreId may require a different tag from PackageData #7488
-				throw new DataCorruptionError("channelFactoryNotRegisteredForAttachMessageType", {
-					channelId: {
-						value: this.id,
-						tag: TelemetryDataTag.CodeArtifact,
-					},
-					dataStoreId: {
-						value: this.dataStoreContext.id,
-						tag: TelemetryDataTag.CodeArtifact,
-					},
-					dataStorePackagePath: this.dataStoreContext.packagePath.join("/"),
-					channelFactoryType: this.attachMessageType,
-				});
-			}
-			attributes = factory.attributes;
-		} else {
-			factory = this.registry.get(attributes.type);
-			if (factory === undefined) {
-				// TODO: dataStoreId may require a different tag from PackageData #7488
-				throw new DataCorruptionError("channelFactoryNotRegisteredForGivenType", {
-					channelId: {
-						value: this.id,
-						tag: TelemetryDataTag.CodeArtifact,
-					},
-					dataStoreId: {
-						value: this.dataStoreContext.id,
-						tag: TelemetryDataTag.CodeArtifact,
-					},
-					dataStorePackagePath: this.dataStoreContext.packagePath.join("/"),
-					channelFactoryType: attributes.type,
-				});
-			}
+		// This is a backward compatibility case where the attach message doesn't include attributes. They must
+		// include attach message type.
+		// Since old attach messages will not have attributes, we need to keep this as long as we support old attach
+		// messages.
+		const channelFactoryType = attributes ? attributes.type : this.attachMessageType;
+		if (channelFactoryType === undefined) {
+			throw new DataCorruptionError("channelTypeNotAvailable", {
+				channelId: {
+					value: this.id,
+					tag: TelemetryDataTag.CodeArtifact,
+				},
+				dataStoreId: {
+					value: this.dataStoreContext.id,
+					tag: TelemetryDataTag.CodeArtifact,
+				},
+				dataStorePackagePath: this.dataStoreContext.packagePath.join("/"),
+				channelFactoryType: this.attachMessageType,
+			});
 		}
+		const factory = this.registry.get(channelFactoryType);
+		if (factory === undefined) {
+			// TODO: dataStoreId may require a different tag from PackageData #7488
+			throw new DataCorruptionError("channelFactoryNotRegisteredForGivenType", {
+				channelId: {
+					value: this.id,
+					tag: TelemetryDataTag.CodeArtifact,
+				},
+				dataStoreId: {
+					value: this.dataStoreContext.id,
+					tag: TelemetryDataTag.CodeArtifact,
+				},
+				dataStorePackagePath: this.dataStoreContext.packagePath.join("/"),
+				channelFactoryType,
+			});
+		}
+
+		// This is a backward compatibility case where the attach message doesn't include attributes. Get the attributes
+		// from the factory.
+		attributes = attributes ?? factory.attributes;
 
 		// Compare snapshot version to collaborative object version
 		if (