@fluidframework/datastore 2.41.0-338401 → 2.42.0

package/src/localChannelContext.ts

@@ -42,7 +42,9 @@ import { ISharedObjectRegistry } from "./dataStoreRuntime.js";
  */
 export abstract class LocalChannelContextBase implements IChannelContext {
 	private globallyVisible = false;
-	/** Tracks the messages for this channel that are sent while it's not loaded */
+	/**
+	 * Tracks the messages for this channel that are sent while it's not loaded
+	 */
 	protected pendingMessagesState: IPendingMessagesState = {
 		messageCollections: [],
 		pendingCount: 0,
@@ -57,7 +59,7 @@ export abstract class LocalChannelContextBase implements IChannelContext {
 		assert(!this.id.includes("/"), 0x30f /* Channel context ID cannot contain slashes */);
 	}
 
-	protected get isGloballyVisible() {
+	protected get isGloballyVisible(): boolean {
 		return this.globallyVisible;
 	}
 
@@ -72,7 +74,7 @@ export abstract class LocalChannelContextBase implements IChannelContext {
 		return this._channel !== undefined;
 	}
 
-	public setConnectionState(connected: boolean, clientId?: string) {
+	public setConnectionState(connected: boolean, clientId?: string): void {
 		// Connection events are ignored if the data store is not yet globallyVisible or loaded
 		if (this.globallyVisible && this.isLoaded) {
 			this.services.value.deltaConnection.setConnectionState(connected);
@@ -101,13 +103,13 @@ export abstract class LocalChannelContextBase implements IChannelContext {
 			);
 			const propsCopy = {
 				...messageCollection,
-				messagesContent: Array.from(messageCollection.messagesContent),
+				messagesContent: [...messageCollection.messagesContent],
 			};
 			this.pendingMessagesState.messageCollections.push(propsCopy);
 		}
 	}
 
-	public reSubmit(content: any, localOpMetadata: unknown, squash: boolean) {
+	public reSubmit(content: unknown, localOpMetadata: unknown, squash: boolean): void {
 		assert(this.isLoaded, 0x18a /* "Channel should be loaded to resubmit ops" */);
 		assert(
 			this.globallyVisible,
@@ -115,7 +117,7 @@ export abstract class LocalChannelContextBase implements IChannelContext {
 		);
 		this.services.value.deltaConnection.reSubmit(content, localOpMetadata, squash);
 	}
-	public rollback(content: any, localOpMetadata: unknown) {
+	public rollback(content: unknown, localOpMetadata: unknown): void {
 		assert(this.isLoaded, 0x2ee /* "Channel should be loaded to rollback ops" */);
 		assert(
 			this.globallyVisible,
@@ -198,7 +200,7 @@ export abstract class LocalChannelContextBase implements IChannelContext {
 		return channel.getGCData(fullGC);
 	}
 
-	public updateUsedRoutes(usedRoutes: string[]) {
+	public updateUsedRoutes(usedRoutes: string[]): void {
 		/**
 		 * Currently, DDSes are always considered referenced and are not garbage collected.
 		 * Once we have GC at DDS level, this channel context's used routes will be updated as per the passed
@@ -216,7 +218,7 @@ export class RehydratedLocalChannelContext extends LocalChannelContextBase {
 		dataStoreContext: IFluidDataStoreContext,
 		storageService: IDocumentStorageService,
 		logger: ITelemetryLoggerExt,
-		submitFn: (content: any, localOpMetadata: unknown) => void,
+		submitFn: (content: unknown, localOpMetadata: unknown) => void,
 		dirtyFn: (address: string) => void,
 		private readonly snapshotTree: ISnapshotTree,
 		extraBlob?: Map<string, ArrayBufferLike>,
@@ -267,9 +269,9 @@ export class RehydratedLocalChannelContext extends LocalChannelContextBase {
 						this.services.value.deltaConnection.processMessages(messageCollection);
 					}
 					return channel;
-				} catch (err) {
+				} catch (error) {
 					throw DataProcessingError.wrapIfUnrecognized(
-						err,
+						error,
 						"rehydratedLocalChannelContextFailedToLoadChannel",
 						undefined,
 					);
@@ -282,7 +284,7 @@ export class RehydratedLocalChannelContext extends LocalChannelContextBase {
 		};
 	}
 
-	public override applyStashedOp(content) {
+	public override applyStashedOp(content: unknown): unknown {
 		return this.services.value.deltaConnection.applyStashedOp(content);
 	}
 
@@ -293,12 +295,12 @@ export class RehydratedLocalChannelContext extends LocalChannelContextBase {
 		let sanitize = false;
 		const blobsContents = snapshotTree.blobsContents;
 		if (blobsContents !== undefined) {
-			Object.entries(blobsContents).forEach(([key, value]) => {
+			for (const [key, value] of Object.entries(blobsContents)) {
 				blobMap.set(key, value);
 				if (snapshotTree.blobs[key] !== undefined) {
 					sanitize = true;
 				}
-			});
+			}
 		}
 		for (const value of Object.values(snapshotTree.trees)) {
 			sanitize = sanitize || this.isSnapshotInOldFormatAndCollectBlobs(value, blobMap);
@@ -306,7 +308,7 @@ export class RehydratedLocalChannelContext extends LocalChannelContextBase {
 		return sanitize;
 	}
 
-	private sanitizeSnapshot(snapshotTree: ISnapshotTree) {
+	private sanitizeSnapshot(snapshotTree: ISnapshotTree): void {
 		const blobMapInitial = new Map(Object.entries(snapshotTree.blobs));
 		for (const [blobName, blobId] of blobMapInitial.entries()) {
 			const blobValue = blobMapInitial.get(blobId);
@@ -329,7 +331,7 @@ export class LocalChannelContext extends LocalChannelContextBase {
 		dataStoreContext: IFluidDataStoreContext,
 		storageService: IDocumentStorageService,
 		logger: ITelemetryLoggerExt,
-		submitFn: (content: any, localOpMetadata: unknown) => void,
+		submitFn: (content: unknown, localOpMetadata: unknown) => void,
 		dirtyFn: (address: string) => void,
 	) {
 		super(
@@ -355,7 +357,7 @@ export class LocalChannelContext extends LocalChannelContextBase {
 		};
 	}
 
-	public applyStashedOp() {
+	public applyStashedOp(): void {
 		throw new Error("no stashed ops on local channel");
 	}
 }

package/src/localChannelStorageService.ts

@@ -21,7 +21,7 @@ export class LocalChannelStorageService implements IChannelStorageService {
 
 	public async contains(path: string): Promise<boolean> {
 		const blob = this.readBlobSync(path);
-		return blob !== undefined ? blob.contents !== undefined : false;
+		return blob === undefined ? false : blob.contents !== undefined;
 	}
 
 	public async list(path: string): Promise<string[]> {
@@ -35,17 +35,19 @@ export class LocalChannelStorageService implements IChannelStorageService {
 	private readBlobSyncInternal(path: string, tree: ITree): IBlob | undefined {
 		for (const entry of tree.entries) {
 			switch (entry.type) {
-				case TreeEntry.Blob:
+				case TreeEntry.Blob: {
 					if (path === entry.path) {
 						return entry.value;
 					}
 					break;
+				}
 
-				case TreeEntry.Tree:
+				case TreeEntry.Tree: {
 					if (path.startsWith(entry.path)) {
-						return this.readBlobSyncInternal(path.substr(entry.path.length + 1), entry.value);
+						return this.readBlobSyncInternal(path.slice(entry.path.length + 1), entry.value);
 					}
 					break;
+				}
 
 				default:
 			}

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/datastore";
-export const pkgVersion = "2.41.0-338401";
+export const pkgVersion = "2.42.0";

package/src/remoteChannelContext.ts

@@ -43,7 +43,9 @@ import { ISharedObjectRegistry } from "./dataStoreRuntime.js";
 
 export class RemoteChannelContext implements IChannelContext {
 	private isLoaded = false;
-	/** Tracks the messages for this channel that are sent while it's not loaded */
+	/**
+	 * Tracks the messages for this channel that are sent while it's not loaded
+	 */
 	private pendingMessagesState: IPendingMessagesState | undefined = {
 		messageCollections: [],
 		pendingCount: 0,
@@ -60,7 +62,7 @@ export class RemoteChannelContext implements IChannelContext {
 		runtime: IFluidDataStoreRuntime,
 		dataStoreContext: IFluidDataStoreContext,
 		storageService: IDocumentStorageService,
-		submitFn: (content: any, localOpMetadata: unknown) => void,
+		submitFn: (content: unknown, localOpMetadata: unknown) => void,
 		dirtyFn: (address: string) => void,
 		private readonly id: string,
 		baseSnapshot: ISnapshotTree,
@@ -128,21 +130,19 @@ export class RemoteChannelContext implements IChannelContext {
 			return this.channel;
 		});
 
-		const thisSummarizeInternal = async (
-			fullTree: boolean,
-			trackState: boolean,
-			telemetryContext?: ITelemetryContext,
-			incrementalSummaryContext?: IExperimentalIncrementalSummaryContext,
-		) =>
-			this.summarizeInternal(
+		this.summarizerNode = createSummarizerNode(
+			async (
 				fullTree,
 				trackState,
 				telemetryContext,
 				incrementalSummaryContext,
-			);
-
-		this.summarizerNode = createSummarizerNode(
-			thisSummarizeInternal,
+			): Promise<ISummarizeInternalResult> =>
+				this.summarizeInternal(
+					fullTree,
+					trackState,
+					telemetryContext,
+					incrementalSummaryContext,
+				),
 			async (fullGC?: boolean) => this.getGCDataInternal(fullGC),
 		);
 
@@ -157,7 +157,7 @@ export class RemoteChannelContext implements IChannelContext {
 		return this.channelP;
 	}
 
-	public setConnectionState(connected: boolean, clientId?: string) {
+	public setConnectionState(connected: boolean, clientId?: string): void {
 		// Connection events are ignored if the data store is not yet loaded
 		if (!this.isLoaded) {
 			return;
@@ -166,7 +166,7 @@ export class RemoteChannelContext implements IChannelContext {
 		this.services.deltaConnection.setConnectionState(connected);
 	}
 
-	public applyStashedOp(content: any): unknown {
+	public applyStashedOp(content: unknown): unknown {
 		assert(this.isLoaded, 0x194 /* "Remote channel must be loaded when rebasing op" */);
 		return this.services.deltaConnection.applyStashedOp(content);
 	}
@@ -189,7 +189,7 @@ export class RemoteChannelContext implements IChannelContext {
 			);
 			this.pendingMessagesState.messageCollections.push({
 				...messageCollection,
-				messagesContent: Array.from(messagesContent),
+				messagesContent: [...messagesContent],
 			});
 			this.pendingMessagesState.pendingCount += messagesContent.length;
 			this.thresholdOpsCounter.sendIfMultiple(
@@ -199,13 +199,13 @@ export class RemoteChannelContext implements IChannelContext {
 		}
 	}
 
-	public reSubmit(content: any, localOpMetadata: unknown, squash: boolean) {
+	public reSubmit(content: unknown, localOpMetadata: unknown, squash: boolean): void {
 		assert(this.isLoaded, 0x196 /* "Remote channel must be loaded when resubmitting op" */);
 
 		this.services.deltaConnection.reSubmit(content, localOpMetadata, squash);
 	}
 
-	public rollback(content: any, localOpMetadata: unknown) {
+	public rollback(content: unknown, localOpMetadata: unknown): void {
 		assert(this.isLoaded, 0x2f0 /* "Remote channel must be loaded when rolling back op" */);
 
 		this.services.deltaConnection.rollback(content, localOpMetadata);
@@ -263,7 +263,7 @@ export class RemoteChannelContext implements IChannelContext {
 		return channel.getGCData(fullGC);
 	}
 
-	public updateUsedRoutes(usedRoutes: string[]) {
+	public updateUsedRoutes(usedRoutes: string[]): void {
 		/**
 		 * Currently, DDSes are always considered referenced and are not garbage collected. Update the summarizer node's
 		 * used routes to contain a route to this channel context.