@fluidframework/map 0.52.1 → 0.53.0-46105

package/lib/directory.js

@@ -421,7 +421,7 @@ export class SharedDirectory extends SharedObject {
             const op = message.contents;
             const handler = this.messageHandlers.get(op.type);
             assert(handler !== undefined, 0x00e /* `Missing message handler for message type: ${message.type}` */);
-            handler.process(op, local, message, localOpMetadata);
+            handler.process(op, local, localOpMetadata);
         }
     }
     /**
@@ -450,10 +450,10 @@ export class SharedDirectory extends SharedObject {
      */
     setMessageHandlers() {
         this.messageHandlers.set("clear", {
-            process: (op, local, message, localOpMetadata) => {
+            process: (op, local, localOpMetadata) => {
                 const subdir = this.getWorkingDirectory(op.path);
                 if (subdir) {
-                    subdir.processClearMessage(op, local, message, localOpMetadata);
+                    subdir.processClearMessage(op, local, localOpMetadata);
                 }
             },
             submit: (op, localOpMetadata) => {
@@ -465,10 +465,10 @@ export class SharedDirectory extends SharedObject {
             },
         });
         this.messageHandlers.set("delete", {
-            process: (op, local, message, localOpMetadata) => {
+            process: (op, local, localOpMetadata) => {
                 const subdir = this.getWorkingDirectory(op.path);
                 if (subdir) {
-                    subdir.processDeleteMessage(op, local, message, localOpMetadata);
+                    subdir.processDeleteMessage(op, local, localOpMetadata);
                 }
             },
             submit: (op, localOpMetadata) => {
@@ -480,11 +480,11 @@ export class SharedDirectory extends SharedObject {
             },
         });
         this.messageHandlers.set("set", {
-            process: (op, local, message, localOpMetadata) => {
+            process: (op, local, localOpMetadata) => {
                 const subdir = this.getWorkingDirectory(op.path);
                 if (subdir) {
                     const context = local ? undefined : this.makeLocal(op.key, op.path, op.value);
-                    subdir.processSetMessage(op, context, local, message, localOpMetadata);
+                    subdir.processSetMessage(op, context, local, localOpMetadata);
                 }
             },
             submit: (op, localOpMetadata) => {
@@ -496,10 +496,10 @@ export class SharedDirectory extends SharedObject {
             },
         });
         this.messageHandlers.set("createSubDirectory", {
-            process: (op, local, message, localOpMetadata) => {
+            process: (op, local, localOpMetadata) => {
                 const parentSubdir = this.getWorkingDirectory(op.path);
                 if (parentSubdir) {
-                    parentSubdir.processCreateSubDirectoryMessage(op, local, message, localOpMetadata);
+                    parentSubdir.processCreateSubDirectoryMessage(op, local, localOpMetadata);
                 }
             },
             submit: (op, localOpMetadata) => {
@@ -511,10 +511,10 @@ export class SharedDirectory extends SharedObject {
             },
         });
         this.messageHandlers.set("deleteSubDirectory", {
-            process: (op, local, message, localOpMetadata) => {
+            process: (op, local, localOpMetadata) => {
                 const parentSubdir = this.getWorkingDirectory(op.path);
                 if (parentSubdir) {
-                    parentSubdir.processDeleteSubDirectoryMessage(op, local, message, localOpMetadata);
+                    parentSubdir.processDeleteSubDirectoryMessage(op, local, localOpMetadata);
                 }
             },
             submit: (op, localOpMetadata) => {
@@ -629,7 +629,7 @@ class SubDirectory extends TypedEventEmitter {
         const localValue = this.directory.localValueMaker.fromInMemory(value);
         const serializableValue = makeSerializable(localValue, this.serializer, this.directory.handle);
         // Set the value locally.
-        this.setCore(key, localValue, true, null);
+        this.setCore(key, localValue, true);
         // If we are not attached, don't submit the op.
         if (!this.directory.isAttached()) {
             return this;
@@ -655,7 +655,7 @@ class SubDirectory extends TypedEventEmitter {
             throw new Error(`SubDirectory name may not contain ${posix.sep}`);
         }
         // Create the sub directory locally first.
-        this.createSubDirectoryCore(subdirName, true, null);
+        this.createSubDirectoryCore(subdirName, true);
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const subDir = this._subdirectories.get(subdirName);
         // If we are not attached, don't submit the op.
@@ -687,7 +687,7 @@ class SubDirectory extends TypedEventEmitter {
      */
     deleteSubDirectory(subdirName) {
         // Delete the sub directory locally first.
-        const successfullyRemoved = this.deleteSubDirectoryCore(subdirName, true, null);
+        const successfullyRemoved = this.deleteSubDirectoryCore(subdirName, true);
         // If we are not attached, don't submit the op.
         if (!this.directory.isAttached()) {
             return successfullyRemoved;
@@ -719,7 +719,7 @@ class SubDirectory extends TypedEventEmitter {
      */
     delete(key) {
         // Delete the key locally first.
-        const successfullyRemoved = this.deleteCore(key, true, null);
+        const successfullyRemoved = this.deleteCore(key, true);
         // If we are not attached, don't submit the op.
         if (!this.directory.isAttached()) {
             return successfullyRemoved;
@@ -737,7 +737,7 @@ class SubDirectory extends TypedEventEmitter {
      */
     clear() {
         // Clear the data locally first.
-        this.clearCore(true, null);
+        this.clearCore(true);
         // If we are not attached, don't submit the op.
         if (!this.directory.isAttached()) {
             return;
@@ -832,7 +832,7 @@ class SubDirectory extends TypedEventEmitter {
      * For messages from a remote client, this will be undefined.
      * @internal
      */
-    processClearMessage(op, local, message, localOpMetadata) {
+    processClearMessage(op, local, localOpMetadata) {
         if (local) {
             assert(localOpMetadata !== undefined, 0x00f /* `pendingMessageId is missing from the local client's ${op.type} operation` */);
             const pendingMessageId = localOpMetadata;
@@ -842,7 +842,7 @@ class SubDirectory extends TypedEventEmitter {
             return;
         }
         this.clearExceptPendingKeys();
-        this.directory.emit("clear", local, op, this.directory);
+        this.directory.emit("clear", local, this.directory);
     }
     /**
      * Process a delete operation.
@@ -853,11 +853,11 @@ class SubDirectory extends TypedEventEmitter {
      * For messages from a remote client, this will be undefined.
      * @internal
      */
-    processDeleteMessage(op, local, message, localOpMetadata) {
-        if (!this.needProcessStorageOperation(op, local, message, localOpMetadata)) {
+    processDeleteMessage(op, local, localOpMetadata) {
+        if (!this.needProcessStorageOperation(op, local, localOpMetadata)) {
             return;
         }
-        this.deleteCore(op.key, local, message);
+        this.deleteCore(op.key, local);
     }
     /**
      * Process a set operation.
@@ -868,14 +868,14 @@ class SubDirectory extends TypedEventEmitter {
      * For messages from a remote client, this will be undefined.
      * @internal
      */
-    processSetMessage(op, context, local, message, localOpMetadata) {
-        if (!this.needProcessStorageOperation(op, local, message, localOpMetadata)) {
+    processSetMessage(op, context, local, localOpMetadata) {
+        if (!this.needProcessStorageOperation(op, local, localOpMetadata)) {
             return;
         }
         // needProcessStorageOperation should have returned false if local is true
         // so we can assume context is not undefined
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        this.setCore(op.key, context, local, message);
+        this.setCore(op.key, context, local);
     }
     /**
      * Process a create subdirectory operation.
@@ -886,11 +886,11 @@ class SubDirectory extends TypedEventEmitter {
      * For messages from a remote client, this will be undefined.
      * @internal
      */
-    processCreateSubDirectoryMessage(op, local, message, localOpMetadata) {
-        if (!this.needProcessSubDirectoryOperations(op, local, message, localOpMetadata)) {
+    processCreateSubDirectoryMessage(op, local, localOpMetadata) {
+        if (!this.needProcessSubDirectoryOperations(op, local, localOpMetadata)) {
             return;
         }
-        this.createSubDirectoryCore(op.subdirName, local, message);
+        this.createSubDirectoryCore(op.subdirName, local);
     }
     /**
      * Process a delete subdirectory operation.
@@ -901,11 +901,11 @@ class SubDirectory extends TypedEventEmitter {
      * For messages from a remote client, this will be undefined.
      * @internal
      */
-    processDeleteSubDirectoryMessage(op, local, message, localOpMetadata) {
-        if (!this.needProcessSubDirectoryOperations(op, local, message, localOpMetadata)) {
+    processDeleteSubDirectoryMessage(op, local, localOpMetadata) {
+        if (!this.needProcessSubDirectoryOperations(op, local, localOpMetadata)) {
             return;
         }
-        this.deleteSubDirectoryCore(op.subdirName, local, message);
+        this.deleteSubDirectoryCore(op.subdirName, local);
     }
     /**
      * Submit a clear operation.
@@ -996,7 +996,7 @@ class SubDirectory extends TypedEventEmitter {
      * For messages from a remote client, this will be undefined.
      * @returns True if the operation should be processed, false otherwise
      */
-    needProcessStorageOperation(op, local, message, localOpMetadata) {
+    needProcessStorageOperation(op, local, localOpMetadata) {
         if (this.pendingClearMessageId !== -1) {
             if (local) {
                 assert(localOpMetadata !== undefined && localOpMetadata < this.pendingClearMessageId, 0x010 /* "Received out of order storage op when there is an unackd clear message" */);
@@ -1030,7 +1030,7 @@ class SubDirectory extends TypedEventEmitter {
      * For messages from a remote client, this will be undefined.
      * @returns True if the operation should be processed, false otherwise
      */
-    needProcessSubDirectoryOperations(op, local, message, localOpMetadata) {
+    needProcessSubDirectoryOperations(op, local, localOpMetadata) {
         if (this.pendingSubDirectories.has(op.subdirName)) {
             if (local) {
                 assert(localOpMetadata !== undefined, 0x012 /* `pendingMessageId is missing from the local client's ${op.type} operation` */);
@@ -1065,9 +1065,9 @@ class SubDirectory extends TypedEventEmitter {
      * @param local - Whether the message originated from the local client
      * @param op - The message if from a remote clear, or null if from a local clear
      */
-    clearCore(local, op) {
+    clearCore(local) {
         this._storage.clear();
-        this.directory.emit("clear", local, op, this.directory);
+        this.directory.emit("clear", local, this.directory);
     }
     /**
      * Delete implementation used for both locally sourced deletes as well as incoming remote deletes.
@@ -1076,12 +1076,12 @@ class SubDirectory extends TypedEventEmitter {
      * @param op - The message if from a remote delete, or null if from a local delete
      * @returns True if the key existed and was deleted, false if it did not exist
      */
-    deleteCore(key, local, op) {
+    deleteCore(key, local) {
         const previousValue = this.get(key);
         const successfullyRemoved = this._storage.delete(key);
         if (successfullyRemoved) {
             const event = { key, path: this.absolutePath, previousValue };
-            this.directory.emit("valueChanged", event, local, op, this.directory);
+            this.directory.emit("valueChanged", event, local, this.directory);
             const containedEvent = { key, previousValue };
             this.emit("containedValueChanged", containedEvent, local, this);
         }
@@ -1094,11 +1094,11 @@ class SubDirectory extends TypedEventEmitter {
      * @param local - Whether the message originated from the local client
      * @param op - The message if from a remote set, or null if from a local set
      */
-    setCore(key, value, local, op) {
+    setCore(key, value, local) {
         const previousValue = this.get(key);
         this._storage.set(key, value);
         const event = { key, path: this.absolutePath, previousValue };
-        this.directory.emit("valueChanged", event, local, op, this.directory);
+        this.directory.emit("valueChanged", event, local, this.directory);
         const containedEvent = { key, previousValue };
         this.emit("containedValueChanged", containedEvent, local, this);
     }
@@ -1106,9 +1106,8 @@ class SubDirectory extends TypedEventEmitter {
      * Create subdirectory implementation used for both locally sourced creation as well as incoming remote creation.
      * @param subdirName - The name of the subdirectory being created
      * @param local - Whether the message originated from the local client
-     * @param op - The message if from a remote create, or null if from a local create
      */
-    createSubDirectoryCore(subdirName, local, op) {
+    createSubDirectoryCore(subdirName, local) {
         if (!this._subdirectories.has(subdirName)) {
             this._subdirectories.set(subdirName, new SubDirectory(this.directory, this.runtime, this.serializer, posix.join(this.absolutePath, subdirName)));
         }
@@ -1119,7 +1118,7 @@ class SubDirectory extends TypedEventEmitter {
      * @param local - Whether the message originated from the local client
      * @param op - The message if from a remote delete, or null if from a local delete
      */
-    deleteSubDirectoryCore(subdirName, local, op) {
+    deleteSubDirectoryCore(subdirName, local) {
         // This should make the subdirectory structure unreachable so it can be GC'd and won't appear in snapshots
         // Might want to consider cleaning out the structure more exhaustively though?
         return this._subdirectories.delete(subdirName);