@fluidframework/map 2.50.0 → 2.51.0

package/lib/packageVersion.d.ts

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export declare const pkgName = "@fluidframework/map";
-export declare const pkgVersion = "2.50.0";
+export declare const pkgVersion = "2.51.0";
 //# sourceMappingURL=packageVersion.d.ts.map

package/lib/packageVersion.js

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export const pkgName = "@fluidframework/map";
-export const pkgVersion = "2.50.0";
+export const pkgVersion = "2.51.0";
 //# sourceMappingURL=packageVersion.js.map

package/lib/packageVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,qBAAqB,CAAC;AAC7C,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/map\";\nexport const pkgVersion = \"2.50.0\";\n"]}
+{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,qBAAqB,CAAC;AAC7C,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/map\";\nexport const pkgVersion = \"2.51.0\";\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/map",
-  "version": "2.50.0",
+  "version": "2.51.0",
   "description": "Distributed map",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -81,33 +81,33 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "~2.50.0",
-    "@fluidframework/core-interfaces": "~2.50.0",
-    "@fluidframework/core-utils": "~2.50.0",
-    "@fluidframework/datastore-definitions": "~2.50.0",
-    "@fluidframework/driver-definitions": "~2.50.0",
-    "@fluidframework/driver-utils": "~2.50.0",
-    "@fluidframework/merge-tree": "~2.50.0",
-    "@fluidframework/runtime-definitions": "~2.50.0",
-    "@fluidframework/runtime-utils": "~2.50.0",
-    "@fluidframework/shared-object-base": "~2.50.0",
-    "@fluidframework/telemetry-utils": "~2.50.0",
+    "@fluid-internal/client-utils": "~2.51.0",
+    "@fluidframework/core-interfaces": "~2.51.0",
+    "@fluidframework/core-utils": "~2.51.0",
+    "@fluidframework/datastore-definitions": "~2.51.0",
+    "@fluidframework/driver-definitions": "~2.51.0",
+    "@fluidframework/driver-utils": "~2.51.0",
+    "@fluidframework/merge-tree": "~2.51.0",
+    "@fluidframework/runtime-definitions": "~2.51.0",
+    "@fluidframework/runtime-utils": "~2.51.0",
+    "@fluidframework/shared-object-base": "~2.51.0",
+    "@fluidframework/telemetry-utils": "~2.51.0",
     "path-browserify": "^1.0.1"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.17.1",
     "@biomejs/biome": "~1.9.3",
-    "@fluid-internal/mocha-test-setup": "~2.50.0",
-    "@fluid-private/stochastic-test-utils": "~2.50.0",
-    "@fluid-private/test-dds-utils": "~2.50.0",
+    "@fluid-internal/mocha-test-setup": "~2.51.0",
+    "@fluid-private/stochastic-test-utils": "~2.51.0",
+    "@fluid-private/test-dds-utils": "~2.51.0",
     "@fluid-tools/benchmark": "^0.51.0",
     "@fluid-tools/build-cli": "^0.56.0",
     "@fluidframework/build-common": "^2.0.3",
     "@fluidframework/build-tools": "^0.56.0",
-    "@fluidframework/container-definitions": "~2.50.0",
+    "@fluidframework/container-definitions": "~2.51.0",
     "@fluidframework/eslint-config-fluid": "^5.7.4",
-    "@fluidframework/map-previous": "npm:@fluidframework/map@2.43.0",
-    "@fluidframework/test-runtime-utils": "~2.50.0",
+    "@fluidframework/map-previous": "npm:@fluidframework/map@2.50.0",
+    "@fluidframework/test-runtime-utils": "~2.51.0",
     "@microsoft/api-extractor": "7.52.8",
     "@types/mocha": "^10.0.10",
     "@types/node": "^18.19.0",

package/src/directory.ts

@@ -47,7 +47,6 @@ import type {
 	ISerializableValue,
 	ISerializedValue,
 } from "./internalInterfaces.js";
-import type { ILocalValue } from "./localValues.js";
 import { serializeValue, migrateIfSharedSerializable } from "./localValues.js";
 
 // We use path-browserify since this code can run safely on the server or the browser.
@@ -890,7 +889,7 @@ export class SharedDirectory
 				// as we are going to delete this subDirectory.
 				if (subdir && !this.isSubDirectoryDeletePending(op.path)) {
 					migrateIfSharedSerializable(op.value, this.serializer, this.handle);
-					const localValue = local ? undefined : { value: op.value.value as unknown };
+					const localValue: unknown = local ? undefined : op.value.value;
 					subdir.processSetMessage(msg, op, localValue, local, localOpMetadata);
 				}
 			},
@@ -1054,13 +1053,13 @@ export class SharedDirectory
 interface IKeyEditLocalOpMetadata {
 	type: "edit";
 	pendingMessageId: number;
-	previousValue: ILocalValue | undefined;
+	previousValue: unknown;
 }
 
 interface IClearLocalOpMetadata {
 	type: "clear";
 	pendingMessageId: number;
-	previousStorage: Map<string, ILocalValue>;
+	previousStorage: Map<string, unknown>;
 }
 
 interface ICreateSubDirLocalOpMetadata {
@@ -1143,7 +1142,7 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
 	/**
 	 * The in-memory data the directory is storing.
 	 */
-	private readonly _storage = new Map<string, ILocalValue>();
+	private readonly _storage = new Map<string, unknown>();
 
 	/**
 	 * The subdirectories the directory is holding.
@@ -1260,7 +1259,7 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
 	 */
 	public get<T = unknown>(key: string): T | undefined {
 		this.throwIfDisposed();
-		return this._storage.get(key)?.value as T | undefined;
+		return this._storage.get(key) as T | undefined;
 	}
 
 	/**
@@ -1274,11 +1273,10 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
 		}
 
 		// Create a local value and serialize it.
-		const localValue: ILocalValue = { value };
-		bindHandles(localValue, this.serializer, this.directory.handle);
+		bindHandles(value, this.serializer, this.directory.handle);
 
 		// Set the value locally.
-		const previousValue = this.setCore(key, localValue, true);
+		const previousValue = this.setCore(key, value, true);
 
 		// If we are not attached, don't submit the op.
 		if (!this.directory.isAttached()) {
@@ -1289,7 +1287,7 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
 			key,
 			path: this.absolutePath,
 			type: "set",
-			value: { type: ValueType[ValueType.Plain], value: localValue.value },
+			value: { type: ValueType[ValueType.Plain], value },
 		};
 		this.submitKeyMessage(op, previousValue);
 		return this;
@@ -1513,7 +1511,7 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
 			return;
 		}
 
-		const copy = new Map<string, ILocalValue>(this._storage);
+		const copy = new Map<string, unknown>(this._storage);
 		this.clearCore(true);
 		const op: IDirectoryClearOperation = {
 			path: this.absolutePath,
@@ -1531,8 +1529,8 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
 	): void {
 		this.throwIfDisposed();
 		// eslint-disable-next-line unicorn/no-array-for-each
-		this._storage.forEach((localValue, key, map) => {
-			callback(localValue.value, key, map);
+		this._storage.forEach((value, key) => {
+			callback(value, key, this);
 		});
 	}
 
@@ -1550,19 +1548,7 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
 	 */
 	public entries(): IterableIterator<[string, unknown]> {
 		this.throwIfDisposed();
-		const localEntriesIterator = this._storage.entries();
-		const iterator = {
-			next(): IteratorResult<[string, unknown]> {
-				const nextVal = localEntriesIterator.next();
-				return nextVal.done
-					? { value: undefined, done: true }
-					: { value: [nextVal.value[0], nextVal.value[1].value], done: false };
-			},
-			[Symbol.iterator](): IterableIterator<[string, unknown]> {
-				return this;
-			},
-		};
-		return iterator;
+		return this._storage.entries();
 	}
 
 	/**
@@ -1580,19 +1566,7 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
 	 */
 	public values(): IterableIterator<unknown> {
 		this.throwIfDisposed();
-		const localValuesIterator = this._storage.values();
-		const iterator = {
-			next(): IteratorResult<unknown> {
-				const nextVal = localValuesIterator.next();
-				return nextVal.done
-					? { value: undefined, done: true }
-					: { value: nextVal.value.value, done: false };
-			},
-			[Symbol.iterator](): IterableIterator<unknown> {
-				return this;
-			},
-		};
-		return iterator;
+		return this._storage.values();
 	}
 
 	/**
@@ -1674,7 +1648,7 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
 	public processSetMessage(
 		msg: ISequencedDocumentMessage,
 		op: IDirectorySetOperation,
-		localValue: ILocalValue | undefined,
+		value: unknown,
 		local: boolean,
 		localOpMetadata: unknown,
 	): void {
@@ -1690,8 +1664,7 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
 
 		// needProcessStorageOperation should have returned false if local is true
 		// so we can assume localValue is not undefined
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		this.setCore(op.key, localValue!, local);
+		this.setCore(op.key, value, local);
 	}
 
 	/**
@@ -1758,7 +1731,7 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
 	 */
 	private submitClearMessage(
 		op: IDirectoryClearOperation,
-		previousValue: Map<string, ILocalValue>,
+		previousValue: Map<string, unknown>,
 	): void {
 		this.throwIfDisposed();
 		const pendingMsgId = ++this.pendingMessageId;
@@ -1809,7 +1782,7 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
 	 * @param op - The operation
 	 * @param previousValue - The value of the key before this op
 	 */
-	private submitKeyMessage(op: IDirectoryKeyOperation, previousValue?: ILocalValue): void {
+	private submitKeyMessage(op: IDirectoryKeyOperation, previousValue?: unknown): void {
 		this.throwIfDisposed();
 		const pendingMessageId = this.getKeyMessageId(op);
 		const localMetadata = { type: "edit", pendingMessageId, previousValue };
@@ -1948,12 +1921,8 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
 		serializer: IFluidSerializer,
 	): Generator<[string, ISerializedValue], void> {
 		this.throwIfDisposed();
-		for (const [key, localValue] of this._storage) {
-			const serializedValue = serializeValue(
-				localValue.value,
-				serializer,
-				this.directory.handle,
-			);
+		for (const [key, value] of this._storage) {
+			const serializedValue = serializeValue(value, serializer, this.directory.handle);
 			const res: [string, ISerializedValue] = [key, serializedValue];
 			yield res;
 		}
@@ -1975,7 +1944,7 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
 	 */
 	public populateStorage(key: string, value: unknown): void {
 		this.throwIfDisposed();
-		this._storage.set(key, { value });
+		this._storage.set(key, value);
 	}
 
 	/**
@@ -1995,7 +1964,7 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
 	 * @param key - The key to retrieve from
 	 * @returns The local value
 	 */
-	public getLocalValue<T extends ILocalValue = ILocalValue>(key: string): T {
+	public getLocalValue<T>(key: string): T {
 		this.throwIfDisposed();
 		return this._storage.get(key) as T;
 	}
@@ -2341,7 +2310,7 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
 	private clearExceptPendingKeys(local: boolean): void {
 		// Assuming the pendingKeys is small and the map is large
 		// we will get the value for the pendingKeys and clear the map
-		const temp = new Map<string, ILocalValue>();
+		const temp = new Map<string, unknown>();
 
 		for (const [key] of this.pendingKeys) {
 			const value = this._storage.get(key);
@@ -2373,9 +2342,9 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
 	 * @param local - Whether the message originated from the local client
 	 * @returns Previous local value of the key if it existed, undefined if it did not exist
 	 */
-	private deleteCore(key: string, local: boolean): ILocalValue | undefined {
+	private deleteCore(key: string, local: boolean): unknown {
 		const previousLocalValue = this._storage.get(key);
-		const previousValue: unknown = previousLocalValue?.value;
+		const previousValue: unknown = previousLocalValue;
 		const successfullyRemoved = this._storage.delete(key);
 		if (successfullyRemoved) {
 			const event: IDirectoryValueChanged = { key, path: this.absolutePath, previousValue };
@@ -2393,9 +2362,9 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
 	 * @param local - Whether the message originated from the local client
 	 * @returns Previous local value of the key, if any
 	 */
-	private setCore(key: string, value: ILocalValue, local: boolean): ILocalValue | undefined {
+	private setCore(key: string, value: unknown, local: boolean): unknown {
 		const previousLocalValue = this._storage.get(key);
-		const previousValue: unknown = previousLocalValue?.value;
+		const previousValue: unknown = previousLocalValue;
 		this._storage.set(key, value);
 		const event: IDirectoryValueChanged = { key, path: this.absolutePath, previousValue };
 		this.directory.emit("valueChanged", event, local, this.directory);

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/map";
-export const pkgVersion = "2.50.0";
+export const pkgVersion = "2.51.0";