@fluidframework/map 1.1.0-75972 → 1.2.0-77818

package/src/directory.ts

@@ -629,6 +629,18 @@ export class SharedDirectory extends SharedObject<ISharedDirectoryEvents> implem
         }
     }
 
+    /**
+     * {@inheritDoc @fluidframework/shared-object-base#SharedObject.rollback}
+     * @internal
+    */
+    protected rollback(content: any, localOpMetadata: unknown) {
+        const op: IDirectoryOperation = content as IDirectoryOperation;
+        const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
+        if (subdir) {
+            subdir.rollback(op, localOpMetadata);
+        }
+    }
+
     /**
      * Converts the given relative path to absolute against the root.
      * @param relativePath - The path to convert
@@ -675,8 +687,7 @@ export class SharedDirectory extends SharedObject<ISharedDirectoryEvents> implem
                 submit: (op: IDirectoryClearOperation, localOpMetadata: unknown) => {
                     const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
                     if (subdir) {
-                        // We don't reuse the metadata but send a new one on each submit.
-                        subdir.submitClearMessage(op);
+                        subdir.resubmitClearMessage(op, localOpMetadata);
                     }
                 },
             },
@@ -693,8 +704,7 @@ export class SharedDirectory extends SharedObject<ISharedDirectoryEvents> implem
                 submit: (op: IDirectoryDeleteOperation, localOpMetadata: unknown) => {
                     const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
                     if (subdir) {
-                        // We don't reuse the metadata but send a new one on each submit.
-                        subdir.submitKeyMessage(op);
+                        subdir.resubmitKeyMessage(op, localOpMetadata);
                     }
                 },
             },
@@ -712,8 +722,7 @@ export class SharedDirectory extends SharedObject<ISharedDirectoryEvents> implem
                 submit: (op: IDirectorySetOperation, localOpMetadata: unknown) => {
                     const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
                     if (subdir) {
-                        // We don't reuse the metadata but send a new one on each submit.
-                        subdir.submitKeyMessage(op);
+                        subdir.resubmitKeyMessage(op, localOpMetadata);
                     }
                 },
             },
@@ -732,7 +741,7 @@ export class SharedDirectory extends SharedObject<ISharedDirectoryEvents> implem
                     const parentSubdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
                     if (parentSubdir) {
                         // We don't reuse the metadata but send a new one on each submit.
-                        parentSubdir.submitSubDirectoryMessage(op);
+                        parentSubdir.resubmitSubDirectoryMessage(op, localOpMetadata);
                     }
                 },
             },
@@ -751,7 +760,7 @@ export class SharedDirectory extends SharedObject<ISharedDirectoryEvents> implem
                     const parentSubdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
                     if (parentSubdir) {
                         // We don't reuse the metadata but send a new one on each submit.
-                        parentSubdir.submitSubDirectoryMessage(op);
+                        parentSubdir.resubmitSubDirectoryMessage(op, localOpMetadata);
                     }
                 },
             },
@@ -832,15 +841,64 @@ export class SharedDirectory extends SharedObject<ISharedDirectoryEvents> implem
     }
 }
 
+interface IKeyEditLocalOpMetadata {
+    type: "edit";
+    pendingMessageId: number;
+    previousValue: ILocalValue | undefined;
+}
+
+interface IClearLocalOpMetadata {
+    type: "clear";
+    pendingMessageId: number;
+    previousStorage: Map<string, ILocalValue>;
+}
+
+interface ICreateSubDirLocalOpMetadata {
+    type: "createSubDir";
+    pendingMessageId: number;
+    previouslyExisted: boolean;
+}
+
+interface IDeleteSubDirLocalOpMetadata {
+    type: "deleteSubDir";
+    pendingMessageId: number;
+    subDirectory: SubDirectory | undefined;
+}
+
+type SubDirLocalOpMetadata = ICreateSubDirLocalOpMetadata | IDeleteSubDirLocalOpMetadata;
+type DirectoryLocalOpMetadata = IClearLocalOpMetadata | IKeyEditLocalOpMetadata | SubDirLocalOpMetadata;
+
+function isKeyEditLocalOpMetadata(metadata: any): metadata is IKeyEditLocalOpMetadata {
+    return metadata !== undefined && typeof metadata.pendingMessageId === "number" && metadata.type === "edit";
+}
+
+function isClearLocalOpMetadata(metadata: any): metadata is IClearLocalOpMetadata {
+    return metadata !== undefined && metadata.type === "clear" && typeof metadata.pendingMessageId === "number" &&
+        typeof metadata.previousStorage === "object";
+}
+
+function isSubDirLocalOpMetadata(metadata: any): metadata is SubDirLocalOpMetadata {
+    return metadata !== undefined && typeof metadata.pendingMessageId === "number" &&
+        ((metadata.type === "createSubDir" && typeof metadata.previouslyExisted === "boolean") ||
+         metadata.type === "deleteSubDir");
+}
+
+function isDirectoryLocalOpMetadata(metadata: any): metadata is DirectoryLocalOpMetadata {
+    return metadata !== undefined && typeof metadata.pendingMessageId === "number" &&
+        (metadata.type === "edit" || metadata.type === "deleteSubDir" ||
+         (metadata.type === "clear" && typeof metadata.previousStorage === "object") ||
+         (metadata.type === "createSubDir" && typeof metadata.previouslyExisted === "boolean"));
+}
+
 /**
  * Node of the directory tree.
  * @sealed
  */
 class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirectory {
     /**
-     * Tells if the sub directory is disposed or not.
+     * Tells if the sub directory is deleted or not.
      */
-    private _disposed = false;
+    private _deleted = false;
 
     /**
      * String representation for the class.
@@ -860,12 +918,12 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
     /**
      * Keys that have been modified locally but not yet ack'd from the server.
      */
-    private readonly pendingKeys: Map<string, number> = new Map();
+    private readonly pendingKeys: Map<string, number[]> = new Map();
 
     /**
      * Subdirectories that have been modified locally but not yet ack'd from the server.
      */
-    private readonly pendingSubDirectories: Map<string, number> = new Map();
+    private readonly pendingSubDirectories: Map<string, number[]> = new Map();
 
     /**
      * This is used to assign a unique id to every outgoing operation and helps in tracking unack'd ops.
@@ -873,10 +931,9 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
     private pendingMessageId: number = -1;
 
     /**
-     * If a clear has been performed locally but not yet ack'd from the server, then this stores the pending id
-     * of that clear operation. Otherwise, is -1.
+     * The pending ids of any clears that have been performed locally but not yet ack'd from the server
      */
-    private pendingClearMessageId: number = -1;
+    private readonly pendingClearMessageIds: number[] = [];
 
     /**
      * Constructor.
@@ -895,16 +952,23 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
     }
 
     public dispose(error?: Error): void {
-        this._disposed = true;
+        this._deleted = true;
         this.emit("disposed", this);
     }
 
+    /**
+     * Unmark the deleted property when rolling back delete.
+     */
+    private undispose(): void {
+        this._deleted = false;
+    }
+
     public get disposed(): boolean {
-        return this._disposed;
+        return this._deleted;
     }
 
     private throwIfDisposed() {
-        if (this._disposed) {
+        if (this._deleted) {
             throw new UsageError("Cannot access Disposed subDirectory");
         }
     }
@@ -945,7 +1009,7 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
             this.directory.handle);
 
         // Set the value locally.
-        this.setCore(
+        const previousValue = this.setCore(
             key,
             localValue,
             true,
@@ -962,7 +1026,7 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
             type: "set",
             value: serializableValue,
         };
-        this.submitKeyMessage(op);
+        this.submitKeyMessage(op, previousValue);
         return this;
     }
 
@@ -988,7 +1052,7 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
         }
 
         // Create the sub directory locally first.
-        this.createSubDirectoryCore(subdirName, true);
+        const isNew = this.createSubDirectoryCore(subdirName, true);
 
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const subDir: IDirectory = this._subdirectories.get(subdirName)!;
@@ -1003,7 +1067,7 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
             subdirName,
             type: "createSubDirectory",
         };
-        this.submitSubDirectoryMessage(op);
+        this.submitCreateSubDirectoryMessage(op, !isNew);
 
         return subDir;
     }
@@ -1030,11 +1094,11 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
     public deleteSubDirectory(subdirName: string): boolean {
         this.throwIfDisposed();
         // Delete the sub directory locally first.
-        const successfullyRemoved = this.deleteSubDirectoryCore(subdirName, true);
+        const subDir = this.deleteSubDirectoryCore(subdirName, true);
 
         // If we are not attached, don't submit the op.
         if (!this.directory.isAttached()) {
-            return successfullyRemoved;
+            return subDir !== undefined;
         }
 
         const op: IDirectoryDeleteSubDirectoryOperation = {
@@ -1043,8 +1107,8 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
             type: "deleteSubDirectory",
         };
 
-        this.submitSubDirectoryMessage(op);
-        return successfullyRemoved;
+        this.submitDeleteSubDirectoryMessage(op, subDir);
+        return subDir !== undefined;
     }
 
     /**
@@ -1071,11 +1135,11 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
     public delete(key: string): boolean {
         this.throwIfDisposed();
         // Delete the key locally first.
-        const successfullyRemoved = this.deleteCore(key, true);
+        const previousValue = this.deleteCore(key, true);
 
         // If we are not attached, don't submit the op.
         if (!this.directory.isAttached()) {
-            return successfullyRemoved;
+            return previousValue !== undefined;
         }
 
         const op: IDirectoryDeleteOperation = {
@@ -1084,8 +1148,8 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
             type: "delete",
         };
 
-        this.submitKeyMessage(op);
-        return successfullyRemoved;
+        this.submitKeyMessage(op, previousValue);
+        return previousValue !== undefined;
     }
 
     /**
@@ -1093,19 +1157,20 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
      */
     public clear(): void {
         this.throwIfDisposed();
-        // Clear the data locally first.
-        this.clearCore(true);
 
         // If we are not attached, don't submit the op.
         if (!this.directory.isAttached()) {
+            this.clearCore(true);
             return;
         }
 
+        const copy = new Map<string, ILocalValue>(this._storage);
+        this.clearCore(true);
         const op: IDirectoryClearOperation = {
             path: this.absolutePath,
             type: "clear",
         };
-        this.submitClearMessage(op);
+        this.submitClearMessage(op, copy);
     }
 
     /**
@@ -1209,16 +1274,14 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
     ): void {
         this.throwIfDisposed();
         if (local) {
-            assert(localOpMetadata !== undefined,
-                0x00f /* pendingMessageId is missing from the local client's operation */);
-            const pendingMessageId = localOpMetadata as number;
-            if (this.pendingClearMessageId === pendingMessageId) {
-                this.pendingClearMessageId = -1;
-            }
+            assert(isClearLocalOpMetadata(localOpMetadata),
+                0x00f /* `pendingMessageId is missing from the local client's ${op.type} operation` */);
+            const pendingClearMessageId = this.pendingClearMessageIds.shift();
+            assert(pendingClearMessageId === localOpMetadata.pendingMessageId,
+                "pendingMessageId does not match");
             return;
         }
         this.clearExceptPendingKeys();
-        this.directory.emit("clear", local, this.directory);
     }
 
     /**
@@ -1284,7 +1347,7 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
         localOpMetadata: unknown,
     ): void {
         this.throwIfDisposed();
-        if (!this.needProcessSubDirectoryOperations(op, local, localOpMetadata)) {
+        if (!this.needProcessSubDirectoryOperation(op, local, localOpMetadata)) {
             return;
         }
         this.createSubDirectoryCore(op.subdirName, local);
@@ -1305,7 +1368,7 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
         localOpMetadata: unknown,
     ): void {
         this.throwIfDisposed();
-        if (!this.needProcessSubDirectoryOperations(op, local, localOpMetadata)) {
+        if (!this.needProcessSubDirectoryOperation(op, local, localOpMetadata)) {
             return;
         }
         this.deleteSubDirectoryCore(op.subdirName, local);
@@ -1314,37 +1377,156 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
     /**
      * Submit a clear operation.
      * @param op - The operation
-     * @internal
      */
-    public submitClearMessage(op: IDirectoryClearOperation): void {
+    private submitClearMessage(op: IDirectoryClearOperation,
+        previousValue: Map<string, ILocalValue>): void {
         this.throwIfDisposed();
+        const pendingMsgId = ++this.pendingMessageId;
+        this.pendingClearMessageIds.push(pendingMsgId);
+        const metadata: IClearLocalOpMetadata = {
+            type: "clear",
+            pendingMessageId: pendingMsgId,
+            previousStorage: previousValue,
+        };
+        this.directory.submitDirectoryMessage(op, metadata);
+    }
+
+    /**
+     * Resubmit a clear operation.
+     * @param op - The operation
+     * @internal
+     */
+    public resubmitClearMessage(op: IDirectoryClearOperation, localOpMetadata: unknown): void {
+        assert(isClearLocalOpMetadata(localOpMetadata), "Invalid localOpMetadata for clear");
+        // We don't reuse the metadata pendingMessageId but send a new one on each submit.
+        const pendingClearMessageId = this.pendingClearMessageIds.shift();
+        assert(pendingClearMessageId === localOpMetadata.pendingMessageId,
+            "pendingMessageId does not match");
+        this.submitClearMessage(op, localOpMetadata.previousStorage);
+    }
+
+    /**
+     * Get a new pending message id for the op and cache it to track the pending op
+     */
+    private getKeyMessageId(op: IDirectoryKeyOperation): number {
+        // We don't reuse the metadata pendingMessageId but send a new one on each submit.
         const pendingMessageId = ++this.pendingMessageId;
-        this.directory.submitDirectoryMessage(op, pendingMessageId);
-        this.pendingClearMessageId = pendingMessageId;
+        const pendingMessageIds = this.pendingKeys.get(op.key);
+        if (pendingMessageIds !== undefined) {
+            pendingMessageIds.push(pendingMessageId);
+        } else {
+            this.pendingKeys.set(op.key, [pendingMessageId]);
+        }
+        return pendingMessageId;
     }
 
     /**
      * Submit a key operation.
      * @param op - The operation
+     * @param previousValue - The value of the key before this op
+     */
+    private submitKeyMessage(op: IDirectoryKeyOperation, previousValue?: ILocalValue): void {
+        this.throwIfDisposed();
+        const pendingMessageId = this.getKeyMessageId(op);
+        const localMetadata = { type: "edit", pendingMessageId, previousValue };
+        this.directory.submitDirectoryMessage(op, localMetadata);
+    }
+
+    /**
+     * Submit a key message to remote clients based on a previous submit.
+     * @param op - The map key message
+     * @param localOpMetadata - Metadata from the previous submit
      * @internal
      */
-    public submitKeyMessage(op: IDirectoryKeyOperation): void {
+    public resubmitKeyMessage(op: IDirectoryKeyOperation, localOpMetadata: unknown): void {
+        assert(isKeyEditLocalOpMetadata(localOpMetadata), "Invalid localOpMetadata in submit");
+
+        // clear the old pending message id
+        const pendingMessageIds = this.pendingKeys.get(op.key);
+        assert(pendingMessageIds !== undefined && pendingMessageIds[0] === localOpMetadata.pendingMessageId,
+            "Unexpected pending message received");
+        pendingMessageIds.shift();
+        if (pendingMessageIds.length === 0) {
+            this.pendingKeys.delete(op.key);
+        }
+
+        this.submitKeyMessage(op, localOpMetadata.previousValue);
+    }
+
+    /**
+     * Get a new pending message id for the op and cache it to track the pending op
+     */
+    private getSubDirMessageId(op: IDirectorySubDirectoryOperation): number {
+        // We don't reuse the metadata pendingMessageId but send a new one on each submit.
+        const newMessageId = ++this.pendingMessageId;
+        const pendingMessageIds = this.pendingSubDirectories.get(op.subdirName);
+        if (pendingMessageIds !== undefined) {
+            pendingMessageIds.push(newMessageId);
+        } else {
+            this.pendingSubDirectories.set(op.subdirName, [newMessageId]);
+        }
+        return newMessageId;
+    }
+
+    /**
+     * Submit a create subdirectory operation.
+     * @param op - The operation
+     * @param prevExisted - Whether the subdirectory existed before the op
+     */
+    private submitCreateSubDirectoryMessage(op: IDirectorySubDirectoryOperation,
+        prevExisted: boolean): void {
         this.throwIfDisposed();
-        const pendingMessageId = ++this.pendingMessageId;
-        this.directory.submitDirectoryMessage(op, pendingMessageId);
-        this.pendingKeys.set(op.key, pendingMessageId);
+        const newMessageId = this.getSubDirMessageId(op);
+
+        const localOpMetadata: ICreateSubDirLocalOpMetadata = {
+            type: "createSubDir",
+            pendingMessageId: newMessageId,
+            previouslyExisted: prevExisted,
+        };
+        this.directory.submitDirectoryMessage(op, localOpMetadata);
     }
 
     /**
-     * Submit a subdirectory operation.
+     * Submit a delete subdirectory operation.
      * @param op - The operation
-     * @internal
+     * @param subDir - Any subdirectory deleted by the op
      */
-    public submitSubDirectoryMessage(op: IDirectorySubDirectoryOperation): void {
+    private submitDeleteSubDirectoryMessage(op: IDirectorySubDirectoryOperation,
+        subDir: SubDirectory | undefined): void {
         this.throwIfDisposed();
-        const pendingMessageId = ++this.pendingMessageId;
-        this.directory.submitDirectoryMessage(op, pendingMessageId);
-        this.pendingSubDirectories.set(op.subdirName, pendingMessageId);
+        const newMessageId = this.getSubDirMessageId(op);
+
+        const localOpMetadata: IDeleteSubDirLocalOpMetadata = {
+            type: "deleteSubDir",
+            pendingMessageId: newMessageId,
+            subDirectory: subDir,
+        };
+        this.directory.submitDirectoryMessage(op, localOpMetadata);
+    }
+
+    /**
+     * Submit a subdirectory operation again
+     * @param op - The operation
+     * @param localOpMetadata - metadata submitted with the op originally
+     * @internal
+     */
+    public resubmitSubDirectoryMessage(op: IDirectorySubDirectoryOperation, localOpMetadata: unknown): void {
+        assert(isSubDirLocalOpMetadata(localOpMetadata), "Invalid localOpMetadata for sub directory op");
+
+        // clear the old pending message id
+        const pendingMessageIds = this.pendingSubDirectories.get(op.subdirName);
+        assert(pendingMessageIds !== undefined && pendingMessageIds[0] === localOpMetadata.pendingMessageId,
+            "Unexpected pending message received");
+        pendingMessageIds.shift();
+        if (pendingMessageIds.length === 0) {
+            this.pendingSubDirectories.delete(op.subdirName);
+        }
+
+        if (localOpMetadata.type === "createSubDir") {
+            this.submitCreateSubDirectoryMessage(op, localOpMetadata.previouslyExisted);
+        } else {
+            this.submitDeleteSubDirectoryMessage(op, localOpMetadata.subDirectory);
+        }
     }
 
     /**
@@ -1396,6 +1578,69 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
         return this._storage.get(key) as T;
     }
 
+    /**
+     * Remove the pendingMessageId from the map tracking it on rollback
+     * @param map - map tracking the pending messages
+     * @param key - key of the edit in the op
+     */
+    private rollbackPendingMessageId(map: Map<string, number[]>, key: string, pendingMessageId) {
+        const pendingMessageIds = map.get(key);
+        const lastPendingMessageId = pendingMessageIds?.pop();
+        if (!pendingMessageIds || lastPendingMessageId !== pendingMessageId) {
+            throw new Error("Rollback op does not match last pending");
+        }
+        if (pendingMessageIds.length === 0) {
+            map.delete(key);
+        }
+    }
+
+    /**
+     * Rollback a local op
+     * @param op - The operation to rollback
+     * @param localOpMetadata - The local metadata associated with the op.
+     */
+     public rollback(op: any, localOpMetadata: unknown) {
+        if (!isDirectoryLocalOpMetadata(localOpMetadata)) {
+            throw new Error("Invalid localOpMetadata");
+        }
+
+        if (op.type === "clear" && localOpMetadata.type === "clear") {
+            localOpMetadata.previousStorage.forEach((localValue, key) => {
+                this.setCore(key, localValue, true);
+            });
+
+            const lastPendingClearId = this.pendingClearMessageIds.pop();
+            if (lastPendingClearId === undefined || lastPendingClearId !== localOpMetadata.pendingMessageId) {
+                throw new Error("Rollback op does match last clear");
+            }
+        } else if ((op.type === "delete" || op.type === "set") && localOpMetadata.type === "edit") {
+            if (localOpMetadata.previousValue === undefined) {
+                this.deleteCore(op.key, true);
+            } else {
+                this.setCore(op.key, localOpMetadata.previousValue, true);
+            }
+
+            this.rollbackPendingMessageId(this.pendingKeys, op.key, localOpMetadata.pendingMessageId);
+        } else if (op.type === "createSubDirectory" && localOpMetadata.type === "createSubDir") {
+            if (!localOpMetadata.previouslyExisted) {
+                this.deleteSubDirectoryCore(op.subdirName, true);
+            }
+
+            this.rollbackPendingMessageId(this.pendingSubDirectories, op.subdirName, localOpMetadata.pendingMessageId);
+        } else if (op.type === "deleteSubDirectory" && localOpMetadata.type === "deleteSubDir") {
+            if (localOpMetadata.subDirectory !== undefined) {
+                this.undeleteSubDirectoryTree(localOpMetadata.subDirectory);
+                // don't need to register events because deleting never unregistered
+                this._subdirectories.set(op.subdirName, localOpMetadata.subDirectory);
+                this.emit("subDirectoryCreated", op.subdirName, true, this);
+            }
+
+            this.rollbackPendingMessageId(this.pendingSubDirectories, op.subdirName, localOpMetadata.pendingMessageId);
+        } else {
+            throw new Error("Unsupported op for rollback");
+        }
+    }
+
     /**
      * Converts the given relative path into an absolute path.
      * @param path - Relative path to convert
@@ -1409,10 +1654,9 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
      * If our local operations that have not yet been ack'd will eventually overwrite an incoming operation, we should
      * not process the incoming operation.
      * @param op - Operation to check
-     * @param local - Whether the message originated from the local client
-     * @param message - The message
-     * @param localOpMetadata - For local client messages, this is the metadata that was submitted with the message.
-     * For messages from a remote client, this will be undefined.
+     * @param local - Whether the operation originated from the local client
+     * @param localOpMetadata - For local client ops, this is the metadata that was submitted with the op.
+     * For ops from a remote client, this will be undefined.
      * @returns True if the operation should be processed, false otherwise
      */
     private needProcessStorageOperation(
@@ -1420,9 +1664,10 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
         local: boolean,
         localOpMetadata: unknown,
     ): boolean {
-        if (this.pendingClearMessageId !== -1) {
+        if (this.pendingClearMessageIds.length > 0) {
             if (local) {
-                assert(localOpMetadata !== undefined && localOpMetadata as number < this.pendingClearMessageId,
+                assert(localOpMetadata !== undefined && isKeyEditLocalOpMetadata(localOpMetadata) &&
+                localOpMetadata.pendingMessageId < this.pendingClearMessageIds[0],
                     0x010 /* "Received out of order storage op when there is an unackd clear message" */);
             }
             // If I have a NACK clear, we can ignore all ops.
@@ -1434,10 +1679,13 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
             // 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) {
-                assert(localOpMetadata !== undefined,
+                assert(localOpMetadata !== undefined && isKeyEditLocalOpMetadata(localOpMetadata),
                     0x011 /* pendingMessageId is missing from the local client's operation */);
-                const pendingMessageId = localOpMetadata as number;
-                if (pendingKeyMessageId === pendingMessageId) {
+                const pendingMessageIds = this.pendingKeys.get(op.key);
+                assert(pendingMessageIds !== undefined && pendingMessageIds[0] === localOpMetadata.pendingMessageId,
+                    "Unexpected pending message received");
+                pendingMessageIds.shift();
+                if (pendingMessageIds.length === 0) {
                     this.pendingKeys.delete(op.key);
                 }
             }
@@ -1458,7 +1706,7 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
      * For messages from a remote client, this will be undefined.
      * @returns True if the operation should be processed, false otherwise
      */
-    private needProcessSubDirectoryOperations(
+    private needProcessSubDirectoryOperation(
         op: IDirectorySubDirectoryOperation,
         local: boolean,
         localOpMetadata: unknown,
@@ -1466,10 +1714,13 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
         const pendingSubDirectoryMessageId = this.pendingSubDirectories.get(op.subdirName);
         if (pendingSubDirectoryMessageId !== undefined) {
             if (local) {
-                assert(localOpMetadata !== undefined,
+                assert(isSubDirLocalOpMetadata(localOpMetadata),
                     0x012 /* pendingMessageId is missing from the local client's operation */);
-                const pendingMessageId = localOpMetadata as number;
-                if (pendingSubDirectoryMessageId === pendingMessageId) {
+                const pendingMessageIds = this.pendingSubDirectories.get(op.subdirName);
+                assert(pendingMessageIds !== undefined && pendingMessageIds[0] === localOpMetadata.pendingMessageId,
+                    "Unexpected pending message received");
+                pendingMessageIds.shift();
+                if (pendingMessageIds.length === 0) {
                     this.pendingSubDirectories.delete(op.subdirName);
                 }
             }
@@ -1490,9 +1741,9 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             temp.set(key, this._storage.get(key)!);
         });
-        this._storage.clear();
+        this.clearCore(false);
         temp.forEach((value, key, map) => {
-            this._storage.set(key, value);
+            this.setCore(key, value, true);
         });
     }
 
@@ -1510,11 +1761,11 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
      * Delete implementation used for both locally sourced deletes as well as incoming remote deletes.
      * @param key - The key being deleted
      * @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
-     * @returns True if the key existed and was deleted, false if it did not exist
+     * @returns Previous local value of the key if it existed, undefined if it did not exist
      */
-    private deleteCore(key: string, local: boolean) {
-        const previousValue = this.get(key);
+    private deleteCore(key: string, local: boolean): ILocalValue | undefined {
+        const previousLocalValue = this._storage.get(key);
+        const previousValue = previousLocalValue?.value;
         const successfullyRemoved = this._storage.delete(key);
         if (successfullyRemoved) {
             const event: IDirectoryValueChanged = { key, path: this.absolutePath, previousValue };
@@ -1522,7 +1773,7 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
             const containedEvent: IValueChanged = { key, previousValue };
             this.emit("containedValueChanged", containedEvent, local, this);
         }
-        return successfullyRemoved;
+        return previousLocalValue;
     }
 
     /**
@@ -1530,30 +1781,35 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
      * @param key - The key being set
      * @param value - The value being set
      * @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
+     * @returns Previous local value of the key, if any
      */
-    private setCore(key: string, value: ILocalValue, local: boolean) {
-        const previousValue = this.get(key);
+    private setCore(key: string, value: ILocalValue, local: boolean): ILocalValue | undefined {
+        const previousLocalValue = this._storage.get(key);
+        const previousValue = previousLocalValue?.value;
         this._storage.set(key, value);
         const event: IDirectoryValueChanged = { key, path: this.absolutePath, previousValue };
         this.directory.emit("valueChanged", event, local, this.directory);
         const containedEvent: IValueChanged = { key, previousValue };
         this.emit("containedValueChanged", containedEvent, local, this);
+        return previousLocalValue;
     }
 
     /**
      * 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
+     * @returns - True if is newly created, false if it already existed.
      */
-    private createSubDirectoryCore(subdirName: string, local: boolean) {
+    private createSubDirectoryCore(subdirName: string, local: boolean): boolean {
         if (!this._subdirectories.has(subdirName)) {
             const absolutePath = posix.join(this.absolutePath, subdirName);
             const subDir = new SubDirectory(this.directory, this.runtime, this.serializer, absolutePath);
             this.registerEventsOnSubDirectory(subDir, subdirName);
             this._subdirectories.set(subdirName, subDir);
             this.emit("subDirectoryCreated", subdirName, local, this);
+            return true;
         }
+        return false;
     }
 
     private registerEventsOnSubDirectory(subDirectory: SubDirectory, subDirName: string) {
@@ -1569,18 +1825,17 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
      * Delete subdirectory implementation used for both locally sourced creation as well as incoming remote creation.
      * @param subdirName - The name of the subdirectory being deleted
      * @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
      */
     private deleteSubDirectoryCore(subdirName: string, local: boolean) {
-        const previousValue = this.getSubDirectory(subdirName);
+        const previousValue = this._subdirectories.get(subdirName);
         // 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?
-        const successfullyRemoved = this._subdirectories.delete(subdirName);
+        // Might want to consider cleaning out the structure more exhaustively though? But not when rollback.
         if (previousValue !== undefined) {
+            this._subdirectories.delete(subdirName);
             this.disposeSubDirectoryTree(previousValue);
             this.emit("subDirectoryDeleted", subdirName, local, this);
         }
-        return successfullyRemoved;
+        return previousValue;
     }
 
     private disposeSubDirectoryTree(directory: IDirectory | undefined) {
@@ -1596,4 +1851,12 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
             directory.dispose();
         }
     }
+
+    private undeleteSubDirectoryTree(directory: SubDirectory) {
+        // Restore deleted subdirectory tree. This will unmark "deleted" from the subdirectories from bottom to top.
+        for (const [_, subDirectory] of this._subdirectories.entries()) {
+            this.undeleteSubDirectoryTree(subDirectory);
+        }
+        directory.undispose();
+    }
 }