@fluidframework/map 2.0.0-internal.7.1.0 → 2.0.0-internal.7.1.1

package/dist/directory.js

@@ -1278,9 +1278,12 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
         const pendingMessageIds = this.pendingKeys.get(op.key);
         // Only submit the op, if we have record for it, otherwise it is possible that the older instance
         // is already deleted, in which case we don't need to submit the op.
-        if (pendingMessageIds !== undefined &&
-            pendingMessageIds[0] === localOpMetadata.pendingMessageId) {
-            pendingMessageIds.shift();
+        if (pendingMessageIds !== undefined) {
+            const index = pendingMessageIds.findIndex((id) => id === localOpMetadata.pendingMessageId);
+            if (index === -1) {
+                return;
+            }
+            pendingMessageIds.splice(index, 1);
             if (pendingMessageIds.length === 0) {
                 this.pendingKeys.delete(op.key);
             }
@@ -1522,17 +1525,15 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
             // If I have a NACK clear, we can ignore all ops.
             return false;
         }
-        const pendingKeyMessageId = this.pendingKeys.get(op.key);
-        if (pendingKeyMessageId !== undefined) {
+        const pendingKeyMessageIds = this.pendingKeys.get(op.key);
+        if (pendingKeyMessageIds !== undefined) {
             // Found an NACK op, clear it from the directory if the latest sequence number in the directory
             // match the message's and don't process the op.
             if (local) {
                 (0, core_utils_1.assert)(localOpMetadata !== undefined && isKeyEditLocalOpMetadata(localOpMetadata), 0x011 /* pendingMessageId is missing from the local client's operation */);
-                const pendingMessageIds = this.pendingKeys.get(op.key);
-                (0, core_utils_1.assert)(pendingMessageIds !== undefined &&
-                    pendingMessageIds[0] === localOpMetadata.pendingMessageId, 0x331 /* Unexpected pending message received */);
-                pendingMessageIds.shift();
-                if (pendingMessageIds.length === 0) {
+                (0, core_utils_1.assert)(pendingKeyMessageIds[0] === localOpMetadata.pendingMessageId, 0x331 /* Unexpected pending message received */);
+                pendingKeyMessageIds.shift();
+                if (pendingKeyMessageIds.length === 0) {
                     this.pendingKeys.delete(op.key);
                 }
             }