@fluidframework/map 2.0.0-dev.2.3.0.115467 → 2.0.0-dev.4.1.0.148229

package/src/directory.ts

@@ -6,41 +6,34 @@
 import { assert, TypedEventEmitter } from "@fluidframework/common-utils";
 import { UsageError } from "@fluidframework/container-utils";
 import { readAndParse } from "@fluidframework/driver-utils";
+import { ISequencedDocumentMessage, MessageType } from "@fluidframework/protocol-definitions";
 import {
-    ISequencedDocumentMessage,
-    MessageType,
-} from "@fluidframework/protocol-definitions";
-import {
-    IChannelAttributes,
-    IFluidDataStoreRuntime,
-    IChannelStorageService,
-    IChannelServices,
-    IChannelFactory,
+	IChannelAttributes,
+	IFluidDataStoreRuntime,
+	IChannelStorageService,
+	IChannelServices,
+	IChannelFactory,
 } from "@fluidframework/datastore-definitions";
 import { ISummaryTreeWithStats, ITelemetryContext } from "@fluidframework/runtime-definitions";
 import { IFluidSerializer, SharedObject, ValueType } from "@fluidframework/shared-object-base";
 import { SummaryTreeBuilder } from "@fluidframework/runtime-utils";
 import * as path from "path-browserify";
 import {
-    IDirectory,
-    IDirectoryEvents,
-    IDirectoryValueChanged,
-    ISerializableValue,
-    ISerializedValue,
-    ISharedDirectory,
-    ISharedDirectoryEvents,
-    IValueChanged,
+	IDirectory,
+	IDirectoryEvents,
+	IDirectoryValueChanged,
+	ISerializableValue,
+	ISerializedValue,
+	ISharedDirectory,
+	ISharedDirectoryEvents,
+	IValueChanged,
 } from "./interfaces";
-import {
-    ILocalValue,
-    LocalValueMaker,
-    makeSerializable,
-} from "./localValues";
+import { ILocalValue, LocalValueMaker, makeSerializable } from "./localValues";
 import { pkgVersion } from "./packageVersion";
 
 // We use path-browserify since this code can run safely on the server or the browser.
 // We standardize on using posix slashes everywhere.
-const posix: typeof import("path").posix = path.posix;
+const posix = path.posix;
 
 const snapshotFileName = "header";
 
@@ -48,72 +41,74 @@ const snapshotFileName = "header";
  * Defines the means to process and submit a given op on a directory.
  */
 interface IDirectoryMessageHandler {
-    /**
-     * Apply the given operation.
-     * @param op - The directory operation to apply
-     * @param local - Whether the message originated from the local client
-     * @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.
-     */
-    process(
-        op: IDirectoryOperation,
-        local: boolean,
-        localOpMetadata: unknown,
-    ): void;
-
-    /**
-     * Communicate the operation to remote clients.
-     * @param op - The directory operation to submit
-     * @param localOpMetadata - The metadata to be submitted with the message.
-     */
-    submit(op: IDirectoryOperation, localOpMetadata: unknown): void;
-
-    applyStashedOp(op: IDirectoryOperation): unknown;
+	/**
+	 * Apply the given operation.
+	 * @param msg - The message from the server to apply.
+	 * @param op - The directory operation to apply
+	 * @param local - Whether the message originated from the local client
+	 * @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.
+	 */
+	process(
+		msg: ISequencedDocumentMessage,
+		op: IDirectoryOperation,
+		local: boolean,
+		localOpMetadata: unknown,
+	): void;
+
+	/**
+	 * Communicate the operation to remote clients.
+	 * @param op - The directory operation to submit
+	 * @param localOpMetadata - The metadata to be submitted with the message.
+	 */
+	submit(op: IDirectoryOperation, localOpMetadata: unknown): void;
+
+	applyStashedOp(op: IDirectoryOperation): unknown;
 }
 
 /**
  * Operation indicating a value should be set for a key.
  */
 export interface IDirectorySetOperation {
-    /**
-     * String identifier of the operation type.
-     */
-    type: "set";
-
-    /**
-     * Directory key being modified.
-     */
-    key: string;
-
-    /**
-     * Absolute path of the directory where the modified key is located.
-     */
-    path: string;
-
-    /**
-     * Value to be set on the key.
-     */
-    value: ISerializableValue;
+	/**
+	 * String identifier of the operation type.
+	 */
+	type: "set";
+
+	/**
+	 * Directory key being modified.
+	 */
+	key: string;
+
+	/**
+	 * Absolute path of the directory where the modified key is located.
+	 */
+	path: string;
+
+	/**
+	 * Value to be set on the key.
+	 */
+	value: ISerializableValue;
 }
 
 /**
  * Operation indicating a key should be deleted from the directory.
  */
 export interface IDirectoryDeleteOperation {
-    /**
-     * String identifier of the operation type.
-     */
-    type: "delete";
-
-    /**
-     * Directory key being modified.
-     */
-    key: string;
-
-    /**
-     * Absolute path of the directory where the modified key is located.
-     */
-    path: string;
+	/**
+	 * String identifier of the operation type.
+	 */
+	type: "delete";
+
+	/**
+	 * Directory key being modified.
+	 */
+	key: string;
+
+	/**
+	 * Absolute path of the directory where the modified key is located.
+	 */
+	path: string;
 }
 
 /**
@@ -125,15 +120,15 @@ export type IDirectoryKeyOperation = IDirectorySetOperation | IDirectoryDeleteOp
  * Operation indicating the directory should be cleared.
  */
 export interface IDirectoryClearOperation {
-    /**
-     * String identifier of the operation type.
-     */
-    type: "clear";
-
-    /**
-     * Absolute path of the directory being cleared.
-     */
-    path: string;
+	/**
+	 * String identifier of the operation type.
+	 */
+	type: "clear";
+
+	/**
+	 * Absolute path of the directory being cleared.
+	 */
+	path: string;
 }
 
 /**
@@ -145,53 +140,69 @@ export type IDirectoryStorageOperation = IDirectoryKeyOperation | IDirectoryClea
  * Operation indicating a subdirectory should be created.
  */
 export interface IDirectoryCreateSubDirectoryOperation {
-    /**
-     * String identifier of the operation type.
-     */
-    type: "createSubDirectory";
-
-    /**
-     * Absolute path of the directory that will contain the new subdirectory.
-     */
-    path: string;
-
-    /**
-     * Name of the new subdirectory.
-     */
-    subdirName: string;
+	/**
+	 * String identifier of the operation type.
+	 */
+	type: "createSubDirectory";
+
+	/**
+	 * Absolute path of the directory that will contain the new subdirectory.
+	 */
+	path: string;
+
+	/**
+	 * Name of the new subdirectory.
+	 */
+	subdirName: string;
 }
 
 /**
  * Operation indicating a subdirectory should be deleted.
  */
 export interface IDirectoryDeleteSubDirectoryOperation {
-    /**
-     * String identifier of the operation type.
-     */
-    type: "deleteSubDirectory";
-
-    /**
-     * Absolute path of the directory that contains the directory to be deleted.
-     */
-    path: string;
-
-    /**
-     * Name of the subdirectory to be deleted.
-     */
-    subdirName: string;
+	/**
+	 * String identifier of the operation type.
+	 */
+	type: "deleteSubDirectory";
+
+	/**
+	 * Absolute path of the directory that contains the directory to be deleted.
+	 */
+	path: string;
+
+	/**
+	 * Name of the subdirectory to be deleted.
+	 */
+	subdirName: string;
 }
 
 /**
  * An operation on the subdirectories within a directory
  */
-export type IDirectorySubDirectoryOperation = IDirectoryCreateSubDirectoryOperation
-    | IDirectoryDeleteSubDirectoryOperation;
+export type IDirectorySubDirectoryOperation =
+	| IDirectoryCreateSubDirectoryOperation
+	| IDirectoryDeleteSubDirectoryOperation;
 
 /**
  * Any operation on a directory
  */
 export type IDirectoryOperation = IDirectoryStorageOperation | IDirectorySubDirectoryOperation;
 
+/**
+ * Create info for the subdirectory.
+ */
+export interface ICreateInfo {
+	/**
+	 * Sequence number at which this subdirectory was created.
+	 */
+	csn: number;
+
+	/**
+	 * clientids of the clients which created this sub directory.
+	 */
+	ccIds: string[];
+}
+
 /**
  * Defines the in-memory object structure to be used for the conversion to/from serialized.
  *
@@ -201,15 +212,24 @@ export type IDirectoryOperation = IDirectoryStorageOperation | IDirectorySubDire
  * {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/parse | JSON.parse}.
  */
 export interface IDirectoryDataObject {
-    /**
-     * Key/value date set by the user.
-     */
-    storage?: { [key: string]: ISerializableValue; };
-
-    /**
-     * Recursive sub-directories {@link IDirectoryDataObject | objects}.
-     */
-    subdirectories?: { [subdirName: string]: IDirectoryDataObject; };
+	/**
+	 * Key/value date set by the user.
+	 */
+	storage?: { [key: string]: ISerializableValue };
+
+	/**
+	 * Recursive sub-directories {@link IDirectoryDataObject | objects}.
+	 */
+	subdirectories?: { [subdirName: string]: IDirectoryDataObject };
+
+	/**
+	 * Create info for the sub directory. Since directories with same name can get deleted/created by multiple clients
+	 * asynchronously, this info helps us to determine whether the ops where for the current instance of sub directory
+	 * or not and whether to process them or not based on that. Summaries which were not produced which this change
+	 * will not have this info and in that case we can still run in eventual consistency issues but that is no worse
+	 * than the state before this change.
+	 */
+	ci?: ICreateInfo;
 }
 
 /**
@@ -218,15 +238,15 @@ export interface IDirectoryDataObject {
  * @internal
  */
 export interface IDirectoryNewStorageFormat {
-    /**
-     * Blob IDs representing larger directory data that was serialized.
-     */
-    blobs: string[];
-
-    /**
-     * Storage content representing directory data that was not serialized.
-     */
-    content: IDirectoryDataObject;
+	/**
+	 * Blob IDs representing larger directory data that was serialized.
+	 */
+	blobs: string[];
+
+	/**
+	 * Storage content representing directory data that was not serialized.
+	 */
+	content: IDirectoryDataObject;
 }
 
 /**
@@ -235,57 +255,58 @@ export interface IDirectoryNewStorageFormat {
  * @sealed
  */
 export class DirectoryFactory implements IChannelFactory {
-    /**
-     * {@inheritDoc @fluidframework/datastore-definitions#IChannelFactory."type"}
-     */
-    public static readonly Type = "https://graph.microsoft.com/types/directory";
-
-    /**
-     * {@inheritDoc @fluidframework/datastore-definitions#IChannelFactory.attributes}
-     */
-    public static readonly Attributes: IChannelAttributes = {
-        type: DirectoryFactory.Type,
-        snapshotFormatVersion: "0.1",
-        packageVersion: pkgVersion,
-    };
-
-    /**
-     * {@inheritDoc @fluidframework/datastore-definitions#IChannelFactory."type"}
-     */
-    public get type() {
-        return DirectoryFactory.Type;
-    }
-
-    /**
-     * {@inheritDoc @fluidframework/datastore-definitions#IChannelFactory.attributes}
-     */
-    public get attributes() {
-        return DirectoryFactory.Attributes;
-    }
-
-    /**
-     * {@inheritDoc @fluidframework/datastore-definitions#IChannelFactory.load}
-     */
-    public async load(
-        runtime: IFluidDataStoreRuntime,
-        id: string,
-        services: IChannelServices,
-        attributes: IChannelAttributes): Promise<ISharedDirectory> {
-        const directory = new SharedDirectory(id, runtime, attributes);
-        await directory.load(services);
-
-        return directory;
-    }
-
-    /**
-     * {@inheritDoc @fluidframework/datastore-definitions#IChannelFactory.create}
-     */
-    public create(runtime: IFluidDataStoreRuntime, id: string): ISharedDirectory {
-        const directory = new SharedDirectory(id, runtime, DirectoryFactory.Attributes);
-        directory.initializeLocal();
-
-        return directory;
-    }
+	/**
+	 * {@inheritDoc @fluidframework/datastore-definitions#IChannelFactory."type"}
+	 */
+	public static readonly Type = "https://graph.microsoft.com/types/directory";
+
+	/**
+	 * {@inheritDoc @fluidframework/datastore-definitions#IChannelFactory.attributes}
+	 */
+	public static readonly Attributes: IChannelAttributes = {
+		type: DirectoryFactory.Type,
+		snapshotFormatVersion: "0.1",
+		packageVersion: pkgVersion,
+	};
+
+	/**
+	 * {@inheritDoc @fluidframework/datastore-definitions#IChannelFactory."type"}
+	 */
+	public get type(): string {
+		return DirectoryFactory.Type;
+	}
+
+	/**
+	 * {@inheritDoc @fluidframework/datastore-definitions#IChannelFactory.attributes}
+	 */
+	public get attributes(): IChannelAttributes {
+		return DirectoryFactory.Attributes;
+	}
+
+	/**
+	 * {@inheritDoc @fluidframework/datastore-definitions#IChannelFactory.load}
+	 */
+	public async load(
+		runtime: IFluidDataStoreRuntime,
+		id: string,
+		services: IChannelServices,
+		attributes: IChannelAttributes,
+	): Promise<ISharedDirectory> {
+		const directory = new SharedDirectory(id, runtime, attributes);
+		await directory.load(services);
+
+		return directory;
+	}
+
+	/**
+	 * {@inheritDoc @fluidframework/datastore-definitions#IChannelFactory.create}
+	 */
+	public create(runtime: IFluidDataStoreRuntime, id: string): ISharedDirectory {
+		const directory = new SharedDirectory(id, runtime, DirectoryFactory.Attributes);
+		directory.initializeLocal();
+
+		return directory;
+	}
 }
 
 /**
@@ -300,1700 +321,2038 @@ export class DirectoryFactory implements IChannelFactory {
  *
  * @sealed
  */
-export class SharedDirectory extends SharedObject<ISharedDirectoryEvents> implements ISharedDirectory {
-    /**
-     * Create a new shared directory
-     *
-     * @param runtime - Data store runtime the new shared directory belongs to
-     * @param id - Optional name of the shared directory
-     * @returns Newly create shared directory (but not attached yet)
-     */
-    public static create(runtime: IFluidDataStoreRuntime, id?: string): SharedDirectory {
-        return runtime.createChannel(id, DirectoryFactory.Type) as SharedDirectory;
-    }
-
-    /**
-     * Get a factory for SharedDirectory to register with the data store.
-     *
-     * @returns A factory that creates and load SharedDirectory
-     */
-    public static getFactory(): IChannelFactory {
-        return new DirectoryFactory();
-    }
-
-    /**
-     * String representation for the class.
-     */
-    public [Symbol.toStringTag]: string = "SharedDirectory";
-
-    /**
-     * {@inheritDoc IDirectory.absolutePath}
-     */
-    public get absolutePath(): string {
-        return this.root.absolutePath;
-    }
-
-    /**
-     * @internal
-     */
-    public readonly localValueMaker: LocalValueMaker;
-
-    /**
-     * Root of the SharedDirectory, most operations on the SharedDirectory itself act on the root.
-     */
-    private readonly root: SubDirectory = new SubDirectory(this, this.runtime, this.serializer, posix.sep);
-
-    /**
-     * Mapping of op types to message handlers.
-     */
-    private readonly messageHandlers: Map<string, IDirectoryMessageHandler> = new Map();
-
-    /**
-     * Constructs a new shared directory. If the object is non-local an id and service interfaces will
-     * be provided.
-     * @param id - String identifier for the SharedDirectory
-     * @param runtime - Data store runtime
-     * @param type - Type identifier
-     */
-    constructor(
-        id: string,
-        runtime: IFluidDataStoreRuntime,
-        attributes: IChannelAttributes,
-    ) {
-        super(id, runtime, attributes, "fluid_directory_");
-        this.localValueMaker = new LocalValueMaker(this.serializer);
-        this.setMessageHandlers();
-        // Mirror the containedValueChanged op on the SharedDirectory
-        this.root.on(
-            "containedValueChanged",
-            (changed: IValueChanged, local: boolean) => {
-                this.emit("containedValueChanged", changed, local, this);
-            },
-        );
-        this.root.on(
-            "subDirectoryCreated",
-            (relativePath: string, local: boolean) => {
-                this.emit("subDirectoryCreated", relativePath, local, this);
-            },
-        );
-        this.root.on(
-            "subDirectoryDeleted",
-            (relativePath: string, local: boolean) => {
-                this.emit("subDirectoryDeleted", relativePath, local, this);
-            },
-        );
-    }
-
-    /**
-     * {@inheritDoc IDirectory.get}
-     */
-    public get<T = any>(key: string): T | undefined {
-        return this.root.get<T>(key);
-    }
-
-    /**
-     * {@inheritDoc IDirectory.set}
-     */
-    public set<T = any>(key: string, value: T): this {
-        this.root.set(key, value);
-        return this;
-    }
-
-    public dispose(error?: Error): void {
-        this.root.dispose(error);
-    }
-
-    public get disposed(): boolean {
-        return this.root.disposed;
-    }
-
-    /**
-     * Deletes the given key from within this IDirectory.
-     * @param key - The key to delete
-     * @returns True if the key existed and was deleted, false if it did not exist
-     */
-    public delete(key: string): boolean {
-        return this.root.delete(key);
-    }
-
-    /**
-     * Deletes all keys from within this IDirectory.
-     */
-    public clear(): void {
-        this.root.clear();
-    }
-
-    /**
-     * Checks whether the given key exists in this IDirectory.
-     * @param key - The key to check
-     * @returns True if the key exists, false otherwise
-     */
-    public has(key: string): boolean {
-        return this.root.has(key);
-    }
-
-    /**
-     * The number of entries under this IDirectory.
-     */
-    public get size(): number {
-        return this.root.size;
-    }
-
-    /**
-     * Issue a callback on each entry under this IDirectory.
-     * @param callback - Callback to issue
-     */
-    public forEach(callback: (value: any, key: string, map: Map<string, any>) => void): void {
-        this.root.forEach(callback);
-    }
-
-    /**
-     * Get an iterator over the entries under this IDirectory.
-     * @returns The iterator
-     */
-    public [Symbol.iterator](): IterableIterator<[string, any]> {
-        return this.root[Symbol.iterator]();
-    }
-
-    /**
-     * Get an iterator over the entries under this IDirectory.
-     * @returns The iterator
-     */
-    public entries(): IterableIterator<[string, any]> {
-        return this.root.entries();
-    }
-
-    /**
-     * {@inheritDoc IDirectory.countSubDirectory}
-     */
-    public countSubDirectory(): number {
-        return this.root.countSubDirectory();
-    }
-
-    /**
-     * Get an iterator over the keys under this IDirectory.
-     * @returns The iterator
-     */
-    public keys(): IterableIterator<string> {
-        return this.root.keys();
-    }
-
-    /**
-     * Get an iterator over the values under this IDirectory.
-     * @returns The iterator
-     */
-    public values(): IterableIterator<any> {
-        return this.root.values();
-    }
-
-    /**
-     * {@inheritDoc IDirectory.createSubDirectory}
-     */
-    public createSubDirectory(subdirName: string): IDirectory {
-        return this.root.createSubDirectory(subdirName);
-    }
-
-    /**
-     * {@inheritDoc IDirectory.getSubDirectory}
-     */
-    public getSubDirectory(subdirName: string): IDirectory | undefined {
-        return this.root.getSubDirectory(subdirName);
-    }
-
-    /**
-     * {@inheritDoc IDirectory.hasSubDirectory}
-     */
-    public hasSubDirectory(subdirName: string): boolean {
-        return this.root.hasSubDirectory(subdirName);
-    }
-
-    /**
-     * {@inheritDoc IDirectory.deleteSubDirectory}
-     */
-    public deleteSubDirectory(subdirName: string): boolean {
-        return this.root.deleteSubDirectory(subdirName);
-    }
-
-    /**
-     * {@inheritDoc IDirectory.subdirectories}
-     */
-    public subdirectories(): IterableIterator<[string, IDirectory]> {
-        return this.root.subdirectories();
-    }
-
-    /**
-     * {@inheritDoc IDirectory.getWorkingDirectory}
-     */
-    public getWorkingDirectory(relativePath: string): IDirectory | undefined {
-        const absolutePath = this.makeAbsolute(relativePath);
-        if (absolutePath === posix.sep) {
-            return this.root;
-        }
-
-        let currentSubDir = this.root;
-        const subdirs = absolutePath.substr(1).split(posix.sep);
-        for (const subdir of subdirs) {
-            currentSubDir = currentSubDir.getSubDirectory(subdir) as SubDirectory;
-            if (!currentSubDir) {
-                return undefined;
-            }
-        }
-        return currentSubDir;
-    }
-
-    /**
-     * {@inheritDoc @fluidframework/shared-object-base#SharedObject.summarizeCore}
-     * @internal
-     */
-    protected summarizeCore(
-        serializer: IFluidSerializer,
-        telemetryContext?: ITelemetryContext,
-    ): ISummaryTreeWithStats {
-        return this.serializeDirectory(this.root, serializer);
-    }
-
-    /**
-     * Submits an operation
-     * @param op - Op to submit
-     * @param localOpMetadata - The local metadata associated with the op. We send a unique id that is used to track
-     * this op while it has not been ack'd. This will be sent when we receive this op back from the server.
-     * @internal
-     */
-    public submitDirectoryMessage(op: IDirectoryOperation, localOpMetadata: unknown) {
-        this.submitLocalMessage(op, localOpMetadata);
-    }
-
-    /**
-     * {@inheritDoc @fluidframework/shared-object-base#SharedObject.onDisconnect}
-     * @internal
-     */
-    protected onDisconnect() { }
-
-    /**
-     * {@inheritDoc @fluidframework/shared-object-base#SharedObject.reSubmitCore}
-     * @internal
-     */
-    protected reSubmitCore(content: any, localOpMetadata: unknown) {
-        const message = content as IDirectoryOperation;
-        const handler = this.messageHandlers.get(message.type);
-        assert(handler !== undefined, 0x00d /* Missing message handler for message type */);
-        handler.submit(message, localOpMetadata);
-    }
-
-    /**
-     * {@inheritDoc @fluidframework/shared-object-base#SharedObject.loadCore}
-     * @internal
-     */
-    protected async loadCore(storage: IChannelStorageService) {
-        const data = await readAndParse(storage, snapshotFileName);
-        const newFormat = data as IDirectoryNewStorageFormat;
-        if (Array.isArray(newFormat.blobs)) {
-            // New storage format
-            this.populate(newFormat.content);
-            await Promise.all(newFormat.blobs.map(async (value) => {
-                const dataExtra = await readAndParse(storage, value);
-                this.populate(dataExtra as IDirectoryDataObject);
-            }));
-        } else {
-            // Old storage format
-            this.populate(data as IDirectoryDataObject);
-        }
-    }
-
-    /**
-     * Populate the directory with the given directory data.
-     * @param data - A JSON string containing serialized directory data
-     * @internal
-     */
-    protected populate(data: IDirectoryDataObject) {
-        const stack: [SubDirectory, IDirectoryDataObject][] = [];
-        stack.push([this.root, data]);
-        while (stack.length > 0) {
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            const [currentSubDir, currentSubDirObject] = stack.pop()!;
-            if (currentSubDirObject.subdirectories) {
-                for (const [subdirName, subdirObject] of Object.entries(currentSubDirObject.subdirectories)) {
-                    let newSubDir = currentSubDir.getSubDirectory(subdirName) as SubDirectory;
-                    if (!newSubDir) {
-                        newSubDir = new SubDirectory(
-                            this,
-                            this.runtime,
-                            this.serializer,
-                            posix.join(currentSubDir.absolutePath, subdirName),
-                        );
-                        currentSubDir.populateSubDirectory(subdirName, newSubDir);
-                    }
-                    stack.push([newSubDir, subdirObject]);
-                }
-            }
-
-            if (currentSubDirObject.storage) {
-                for (const [key, serializable] of Object.entries(currentSubDirObject.storage)) {
-                    const localValue = this.makeLocal(
-                        key,
-                        currentSubDir.absolutePath,
-                        serializable,
-                    );
-                    currentSubDir.populateStorage(key, localValue);
-                }
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc @fluidframework/shared-object-base#SharedObject.processCore}
-     * @internal
-     */
-    protected processCore(message: ISequencedDocumentMessage, local: boolean, localOpMetadata: unknown): void {
-        if (message.type === MessageType.Operation) {
-            const op: IDirectoryOperation = message.contents as IDirectoryOperation;
-            const handler = this.messageHandlers.get(op.type);
-            assert(handler !== undefined, 0x00e /* Missing message handler for message type */);
-            handler.process(op, local, localOpMetadata);
-        }
-    }
-
-    /**
-     * {@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
-     */
-    private makeAbsolute(relativePath: string): string {
-        return posix.resolve(posix.sep, relativePath);
-    }
-
-    /**
-     * The remote ISerializableValue we're receiving (either as a result of a snapshot load or an incoming set op)
-     * will have the information we need to create a real object, but will not be the real object yet.  For example,
-     * we might know it's a map and the ID but not have the actual map or its data yet.  makeLocal's job
-     * is to convert that information into a real object for local usage.
-     * @param key - Key of element being converted
-     * @param absolutePath - Path of element being converted
-     * @param serializable - The remote information that we can convert into a real object
-     * @returns The local value that was produced
-     */
-    private makeLocal(
-        key: string,
-        absolutePath: string,
-        serializable: ISerializableValue,
-    ): ILocalValue {
-        assert(
-            serializable.type === ValueType[ValueType.Plain] || serializable.type === ValueType[ValueType.Shared],
-            0x1e4 /* "Unexpected serializable type" */,
-        );
-        return this.localValueMaker.fromSerializable(serializable);
-    }
-
-    /**
-     * Set the message handlers for the directory.
-     */
-    private setMessageHandlers(): void {
-        this.messageHandlers.set(
-            "clear",
-            {
-                process: (op: IDirectoryClearOperation, local, localOpMetadata) => {
-                    const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
-                    if (subdir) {
-                        subdir.processClearMessage(op, local, localOpMetadata);
-                    }
-                },
-                submit: (op: IDirectoryClearOperation, localOpMetadata: unknown) => {
-                    const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
-                    if (subdir) {
-                        subdir.resubmitClearMessage(op, localOpMetadata);
-                    }
-                },
-                applyStashedOp: (op: IDirectoryClearOperation): IClearLocalOpMetadata | undefined => {
-                    const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
-                    if (subdir) {
-                        return subdir.applyStashedClearMessage(op);
-                    }
-                },
-            },
-        );
-        this.messageHandlers.set(
-            "delete",
-            {
-                process: (op: IDirectoryDeleteOperation, local, localOpMetadata) => {
-                    const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
-                    if (subdir) {
-                        subdir.processDeleteMessage(op, local, localOpMetadata);
-                    }
-                },
-                submit: (op: IDirectoryDeleteOperation, localOpMetadata: unknown) => {
-                    const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
-                    if (subdir) {
-                        subdir.resubmitKeyMessage(op, localOpMetadata);
-                    }
-                },
-                applyStashedOp: (op: IDirectoryDeleteOperation): IKeyEditLocalOpMetadata | undefined => {
-                    const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
-                    if (subdir) {
-                        return subdir.applyStashedDeleteMessage(op);
-                    }
-                },
-            },
-        );
-        this.messageHandlers.set(
-            "set",
-            {
-                process: (op: IDirectorySetOperation, local, localOpMetadata) => {
-                    const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
-                    if (subdir) {
-                        const context = local ? undefined : this.makeLocal(op.key, op.path, op.value);
-                        subdir.processSetMessage(op, context, local, localOpMetadata);
-                    }
-                },
-                submit: (op: IDirectorySetOperation, localOpMetadata: unknown) => {
-                    const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
-                    if (subdir) {
-                        subdir.resubmitKeyMessage(op, localOpMetadata);
-                    }
-                },
-                applyStashedOp: (op: IDirectorySetOperation): IKeyEditLocalOpMetadata | undefined => {
-                    const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
-                    if (subdir) {
-                        const context = this.makeLocal(op.key, op.path, op.value);
-                        return subdir.applyStashedSetMessage(op, context);
-                    }
-                },
-            },
-        );
-
-        this.messageHandlers.set(
-            "createSubDirectory",
-            {
-                process: (op: IDirectoryCreateSubDirectoryOperation, local, localOpMetadata) => {
-                    const parentSubdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
-                    if (parentSubdir) {
-                        parentSubdir.processCreateSubDirectoryMessage(op, local, localOpMetadata);
-                    }
-                },
-                submit: (op: IDirectoryCreateSubDirectoryOperation, localOpMetadata: unknown) => {
-                    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.resubmitSubDirectoryMessage(op, localOpMetadata);
-                    }
-                },
-                // eslint-disable-next-line max-len
-                applyStashedOp: (op: IDirectoryCreateSubDirectoryOperation): ICreateSubDirLocalOpMetadata | undefined => {
-                    const parentSubdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
-                    if (parentSubdir) {
-                        return parentSubdir.applyStashedCreateSubDirMessage(op);
-                    }
-                },
-            },
-        );
-
-        this.messageHandlers.set(
-            "deleteSubDirectory",
-            {
-                process: (op: IDirectoryDeleteSubDirectoryOperation, local, localOpMetadata) => {
-                    const parentSubdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
-                    if (parentSubdir) {
-                        parentSubdir.processDeleteSubDirectoryMessage(op, local, localOpMetadata);
-                    }
-                },
-                submit: (op: IDirectoryDeleteSubDirectoryOperation, localOpMetadata: unknown) => {
-                    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.resubmitSubDirectoryMessage(op, localOpMetadata);
-                    }
-                },
-                // eslint-disable-next-line max-len
-                applyStashedOp: (op: IDirectoryDeleteSubDirectoryOperation): IDeleteSubDirLocalOpMetadata | undefined => {
-                    const parentSubdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
-                    if (parentSubdir) {
-                        return parentSubdir.applyStashedDeleteSubDirMessage(op);
-                    }
-                },
-            },
-        );
-    }
-
-    /**
-     * @internal
-     */
-    protected applyStashedOp(op) {
-        const handler = this.messageHandlers.get(op.type);
-        if (handler === undefined) {
-            throw new Error("no apply stashed op handler");
-        }
-        return handler.applyStashedOp(op as IDirectoryOperation);
-    }
-
-    private serializeDirectory(
-        root: SubDirectory,
-        serializer: IFluidSerializer,
-        telemetryContext?: ITelemetryContext,
-    ): ISummaryTreeWithStats {
-        const MinValueSizeSeparateSnapshotBlob = 8 * 1024;
-
-        const builder = new SummaryTreeBuilder();
-        let counter = 0;
-        const blobs: string[] = [];
-
-        const stack: [SubDirectory, IDirectoryDataObject][] = [];
-        const content: IDirectoryDataObject = {};
-        stack.push([root, content]);
-
-        while (stack.length > 0) {
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            const [currentSubDir, currentSubDirObject] = stack.pop()!;
-            for (const [key, value] of currentSubDir.getSerializedStorage(serializer)) {
-                if (!currentSubDirObject.storage) {
-                    currentSubDirObject.storage = {};
-                }
-                const result: ISerializableValue = {
-                    type: value.type,
-                    // eslint-disable-next-line @typescript-eslint/ban-types
-                    value: value.value && JSON.parse(value.value) as object,
-                };
-                if (value.value && value.value.length >= MinValueSizeSeparateSnapshotBlob) {
-                    const extraContent: IDirectoryDataObject = {};
-                    let largeContent = extraContent;
-                    if (currentSubDir.absolutePath !== posix.sep) {
-                        for (const dir of currentSubDir.absolutePath.substr(1).split(posix.sep)) {
-                            const subDataObject: IDirectoryDataObject = {};
-                            largeContent.subdirectories = { [dir]: subDataObject };
-                            largeContent = subDataObject;
-                        }
-                    }
-                    largeContent.storage = { [key]: result };
-                    const blobName = `blob${counter}`;
-                    counter++;
-                    blobs.push(blobName);
-                    builder.addBlob(blobName, JSON.stringify(extraContent));
-                } else {
-                    currentSubDirObject.storage[key] = result;
-                }
-            }
-
-            for (const [subdirName, subdir] of currentSubDir.subdirectories()) {
-                if (!currentSubDirObject.subdirectories) {
-                    currentSubDirObject.subdirectories = {};
-                }
-                const subDataObject: IDirectoryDataObject = {};
-                currentSubDirObject.subdirectories[subdirName] = subDataObject;
-                stack.push([subdir as SubDirectory, subDataObject]);
-            }
-        }
-
-        const newFormat: IDirectoryNewStorageFormat = {
-            blobs,
-            content,
-        };
-        builder.addBlob(snapshotFileName, JSON.stringify(newFormat));
-
-        return builder.getSummaryTree();
-    }
+export class SharedDirectory
+	extends SharedObject<ISharedDirectoryEvents>
+	implements ISharedDirectory
+{
+	/**
+	 * Create a new shared directory
+	 *
+	 * @param runtime - Data store runtime the new shared directory belongs to
+	 * @param id - Optional name of the shared directory
+	 * @returns Newly create shared directory (but not attached yet)
+	 */
+	public static create(runtime: IFluidDataStoreRuntime, id?: string): SharedDirectory {
+		return runtime.createChannel(id, DirectoryFactory.Type) as SharedDirectory;
+	}
+
+	/**
+	 * Get a factory for SharedDirectory to register with the data store.
+	 *
+	 * @returns A factory that creates and load SharedDirectory
+	 */
+	public static getFactory(): IChannelFactory {
+		return new DirectoryFactory();
+	}
+
+	/**
+	 * String representation for the class.
+	 */
+	public [Symbol.toStringTag]: string = "SharedDirectory";
+
+	/**
+	 * {@inheritDoc IDirectory.absolutePath}
+	 */
+	public get absolutePath(): string {
+		return this.root.absolutePath;
+	}
+
+	/**
+	 * @internal
+	 */
+	public readonly localValueMaker: LocalValueMaker;
+
+	/**
+	 * Root of the SharedDirectory, most operations on the SharedDirectory itself act on the root.
+	 */
+	private readonly root: SubDirectory = new SubDirectory(
+		0,
+		new Set(),
+		this,
+		this.runtime,
+		this.serializer,
+		posix.sep,
+	);
+
+	/**
+	 * Mapping of op types to message handlers.
+	 */
+	private readonly messageHandlers: Map<string, IDirectoryMessageHandler> = new Map();
+
+	/**
+	 * Constructs a new shared directory. If the object is non-local an id and service interfaces will
+	 * be provided.
+	 * @param id - String identifier for the SharedDirectory
+	 * @param runtime - Data store runtime
+	 * @param type - Type identifier
+	 */
+	public constructor(
+		id: string,
+		runtime: IFluidDataStoreRuntime,
+		attributes: IChannelAttributes,
+	) {
+		super(id, runtime, attributes, "fluid_directory_");
+		this.localValueMaker = new LocalValueMaker(this.serializer);
+		this.setMessageHandlers();
+		// Mirror the containedValueChanged op on the SharedDirectory
+		this.root.on("containedValueChanged", (changed: IValueChanged, local: boolean) => {
+			this.emit("containedValueChanged", changed, local, this);
+		});
+		this.root.on("subDirectoryCreated", (relativePath: string, local: boolean) => {
+			this.emit("subDirectoryCreated", relativePath, local, this);
+		});
+		this.root.on("subDirectoryDeleted", (relativePath: string, local: boolean) => {
+			this.emit("subDirectoryDeleted", relativePath, local, this);
+		});
+	}
+
+	/**
+	 * {@inheritDoc IDirectory.get}
+	 */
+	// TODO: Use `unknown` instead (breaking change).
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	public get<T = any>(key: string): T | undefined {
+		return this.root.get<T>(key);
+	}
+
+	/**
+	 * {@inheritDoc IDirectory.set}
+	 */
+	public set<T = unknown>(key: string, value: T): this {
+		this.root.set(key, value);
+		return this;
+	}
+
+	public dispose(error?: Error): void {
+		this.root.dispose(error);
+	}
+
+	public get disposed(): boolean {
+		return this.root.disposed;
+	}
+
+	/**
+	 * Deletes the given key from within this IDirectory.
+	 * @param key - The key to delete
+	 * @returns True if the key existed and was deleted, false if it did not exist
+	 */
+	public delete(key: string): boolean {
+		return this.root.delete(key);
+	}
+
+	/**
+	 * Deletes all keys from within this IDirectory.
+	 */
+	public clear(): void {
+		this.root.clear();
+	}
+
+	/**
+	 * Checks whether the given key exists in this IDirectory.
+	 * @param key - The key to check
+	 * @returns True if the key exists, false otherwise
+	 */
+	public has(key: string): boolean {
+		return this.root.has(key);
+	}
+
+	/**
+	 * The number of entries under this IDirectory.
+	 */
+	public get size(): number {
+		return this.root.size;
+	}
+
+	/**
+	 * Issue a callback on each entry under this IDirectory.
+	 * @param callback - Callback to issue
+	 */
+	// TODO: Use `unknown` instead (breaking change).
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	public forEach(callback: (value: any, key: string, map: Map<string, any>) => void): void {
+		// eslint-disable-next-line unicorn/no-array-for-each, unicorn/no-array-callback-reference
+		this.root.forEach(callback);
+	}
+
+	/**
+	 * Get an iterator over the entries under this IDirectory.
+	 * @returns The iterator
+	 */
+	// TODO: Use `unknown` instead (breaking change).
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	public [Symbol.iterator](): IterableIterator<[string, any]> {
+		return this.root[Symbol.iterator]();
+	}
+
+	/**
+	 * Get an iterator over the entries under this IDirectory.
+	 * @returns The iterator
+	 */
+	// TODO: Use `unknown` instead (breaking change).
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	public entries(): IterableIterator<[string, any]> {
+		return this.root.entries();
+	}
+
+	/**
+	 * {@inheritDoc IDirectory.countSubDirectory}
+	 */
+	public countSubDirectory(): number {
+		return this.root.countSubDirectory();
+	}
+
+	/**
+	 * Get an iterator over the keys under this IDirectory.
+	 * @returns The iterator
+	 */
+	public keys(): IterableIterator<string> {
+		return this.root.keys();
+	}
+
+	/**
+	 * Get an iterator over the values under this IDirectory.
+	 * @returns The iterator
+	 */
+	// TODO: Use `unknown` instead (breaking change).
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	public values(): IterableIterator<any> {
+		return this.root.values();
+	}
+
+	/**
+	 * {@inheritDoc IDirectory.createSubDirectory}
+	 */
+	public createSubDirectory(subdirName: string): IDirectory {
+		return this.root.createSubDirectory(subdirName);
+	}
+
+	/**
+	 * {@inheritDoc IDirectory.getSubDirectory}
+	 */
+	public getSubDirectory(subdirName: string): IDirectory | undefined {
+		return this.root.getSubDirectory(subdirName);
+	}
+
+	/**
+	 * {@inheritDoc IDirectory.hasSubDirectory}
+	 */
+	public hasSubDirectory(subdirName: string): boolean {
+		return this.root.hasSubDirectory(subdirName);
+	}
+
+	/**
+	 * {@inheritDoc IDirectory.deleteSubDirectory}
+	 */
+	public deleteSubDirectory(subdirName: string): boolean {
+		return this.root.deleteSubDirectory(subdirName);
+	}
+
+	/**
+	 * {@inheritDoc IDirectory.subdirectories}
+	 */
+	public subdirectories(): IterableIterator<[string, IDirectory]> {
+		return this.root.subdirectories();
+	}
+
+	/**
+	 * {@inheritDoc IDirectory.getWorkingDirectory}
+	 */
+	public getWorkingDirectory(relativePath: string): IDirectory | undefined {
+		const absolutePath = this.makeAbsolute(relativePath);
+		if (absolutePath === posix.sep) {
+			return this.root;
+		}
+
+		let currentSubDir = this.root;
+		const subdirs = absolutePath.slice(1).split(posix.sep);
+		for (const subdir of subdirs) {
+			currentSubDir = currentSubDir.getSubDirectory(subdir) as SubDirectory;
+			if (!currentSubDir) {
+				return undefined;
+			}
+		}
+		return currentSubDir;
+	}
+
+	/**
+	 * {@inheritDoc @fluidframework/shared-object-base#SharedObject.summarizeCore}
+	 * @internal
+	 */
+	protected summarizeCore(
+		serializer: IFluidSerializer,
+		telemetryContext?: ITelemetryContext,
+	): ISummaryTreeWithStats {
+		return this.serializeDirectory(this.root, serializer);
+	}
+
+	/**
+	 * Submits an operation
+	 * @param op - Op to submit
+	 * @param localOpMetadata - The local metadata associated with the op. We send a unique id that is used to track
+	 * this op while it has not been ack'd. This will be sent when we receive this op back from the server.
+	 * @internal
+	 */
+	public submitDirectoryMessage(op: IDirectoryOperation, localOpMetadata: unknown): void {
+		this.submitLocalMessage(op, localOpMetadata);
+	}
+
+	/**
+	 * {@inheritDoc @fluidframework/shared-object-base#SharedObject.onDisconnect}
+	 * @internal
+	 */
+	protected onDisconnect(): void {}
+
+	/**
+	 * {@inheritDoc @fluidframework/shared-object-base#SharedObject.reSubmitCore}
+	 * @internal
+	 */
+	protected reSubmitCore(content: unknown, localOpMetadata: unknown): void {
+		const message = content as IDirectoryOperation;
+		const handler = this.messageHandlers.get(message.type);
+		assert(handler !== undefined, 0x00d /* Missing message handler for message type */);
+		handler.submit(message, localOpMetadata);
+	}
+
+	/**
+	 * {@inheritDoc @fluidframework/shared-object-base#SharedObject.loadCore}
+	 * @internal
+	 */
+	protected async loadCore(storage: IChannelStorageService): Promise<void> {
+		const data = await readAndParse(storage, snapshotFileName);
+		const newFormat = data as IDirectoryNewStorageFormat;
+		if (Array.isArray(newFormat.blobs)) {
+			// New storage format
+			this.populate(newFormat.content);
+			await Promise.all(
+				newFormat.blobs.map(async (value) => {
+					const dataExtra = await readAndParse(storage, value);
+					this.populate(dataExtra as IDirectoryDataObject);
+				}),
+			);
+		} else {
+			// Old storage format
+			this.populate(data as IDirectoryDataObject);
+		}
+	}
+
+	/**
+	 * Populate the directory with the given directory data.
+	 * @param data - A JSON string containing serialized directory data
+	 * @internal
+	 */
+	protected populate(data: IDirectoryDataObject): void {
+		const stack: [SubDirectory, IDirectoryDataObject][] = [];
+		stack.push([this.root, data]);
+		while (stack.length > 0) {
+			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+			const [currentSubDir, currentSubDirObject] = stack.pop()!;
+			if (currentSubDirObject.subdirectories) {
+				for (const [subdirName, subdirObject] of Object.entries(
+					currentSubDirObject.subdirectories,
+				)) {
+					let newSubDir = currentSubDir.getSubDirectory(subdirName) as SubDirectory;
+					if (!newSubDir) {
+						const createInfo = subdirObject.ci;
+						newSubDir = new SubDirectory(
+							createInfo !== undefined ? createInfo.csn : 0,
+							createInfo !== undefined
+								? new Set<string>(createInfo.ccIds)
+								: new Set(),
+							this,
+							this.runtime,
+							this.serializer,
+							posix.join(currentSubDir.absolutePath, subdirName),
+						);
+						currentSubDir.populateSubDirectory(subdirName, newSubDir);
+					}
+					stack.push([newSubDir, subdirObject]);
+				}
+			}
+
+			if (currentSubDirObject.storage) {
+				for (const [key, serializable] of Object.entries(currentSubDirObject.storage)) {
+					const localValue = this.makeLocal(
+						key,
+						currentSubDir.absolutePath,
+						serializable,
+					);
+					currentSubDir.populateStorage(key, localValue);
+				}
+			}
+		}
+	}
+
+	/**
+	 * {@inheritDoc @fluidframework/shared-object-base#SharedObject.processCore}
+	 * @internal
+	 */
+	protected processCore(
+		message: ISequencedDocumentMessage,
+		local: boolean,
+		localOpMetadata: unknown,
+	): void {
+		if (message.type === MessageType.Operation) {
+			const op: IDirectoryOperation = message.contents as IDirectoryOperation;
+			const handler = this.messageHandlers.get(op.type);
+			assert(handler !== undefined, 0x00e /* Missing message handler for message type */);
+			handler.process(message, op, local, localOpMetadata);
+		}
+	}
+
+	/**
+	 * {@inheritDoc @fluidframework/shared-object-base#SharedObject.rollback}
+	 * @internal
+	 */
+	protected rollback(content: unknown, localOpMetadata: unknown): void {
+		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
+	 */
+	private makeAbsolute(relativePath: string): string {
+		return posix.resolve(posix.sep, relativePath);
+	}
+
+	/**
+	 * The remote ISerializableValue we're receiving (either as a result of a snapshot load or an incoming set op)
+	 * will have the information we need to create a real object, but will not be the real object yet.  For example,
+	 * we might know it's a map and the ID but not have the actual map or its data yet.  makeLocal's job
+	 * is to convert that information into a real object for local usage.
+	 * @param key - Key of element being converted
+	 * @param absolutePath - Path of element being converted
+	 * @param serializable - The remote information that we can convert into a real object
+	 * @returns The local value that was produced
+	 */
+	private makeLocal(
+		key: string,
+		absolutePath: string,
+		serializable: ISerializableValue,
+	): ILocalValue {
+		assert(
+			serializable.type === ValueType[ValueType.Plain] ||
+				serializable.type === ValueType[ValueType.Shared],
+			0x1e4 /* "Unexpected serializable type" */,
+		);
+		return this.localValueMaker.fromSerializable(serializable);
+	}
+
+	/**
+	 * This checks if there is pending delete op for local delete for a subdirectory.
+	 * @param relativePath - path of sub directory.
+	 * @returns - true if there is pending delete.
+	 */
+	private isSubDirectoryDeletePending(relativePath: string): boolean {
+		const parentSubDir = this.getParentDirectory(relativePath);
+		const index = relativePath.lastIndexOf(posix.sep);
+		const dirName = relativePath.substring(index + 1);
+		return !!parentSubDir?.isSubDirectoryDeletePending(dirName);
+	}
+
+	/**
+	 * Gets the parent directory of a sub directory.
+	 * @param relativePath - path of sub directory of which parent needs to be find out.
+	 */
+	private getParentDirectory(relativePath: string): SubDirectory | undefined {
+		const absolutePath = this.makeAbsolute(relativePath);
+		if (absolutePath === posix.sep) {
+			return undefined;
+		}
+		const index = absolutePath.lastIndexOf(posix.sep);
+		const parentAbsPath = absolutePath.substring(0, index);
+		return this.getWorkingDirectory(parentAbsPath) as SubDirectory;
+	}
+
+	/**
+	 * Set the message handlers for the directory.
+	 */
+	private setMessageHandlers(): void {
+		this.messageHandlers.set("clear", {
+			process: (
+				msg: ISequencedDocumentMessage,
+				op: IDirectoryClearOperation,
+				local,
+				localOpMetadata,
+			) => {
+				const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
+				// If there is pending delete op for this subDirectory, then don't apply the this op as we are going
+				// to delete this subDirectory.
+				if (subdir && !this.isSubDirectoryDeletePending(op.path)) {
+					subdir.processClearMessage(msg, op, local, localOpMetadata);
+				}
+			},
+			submit: (op: IDirectoryClearOperation, localOpMetadata: unknown) => {
+				const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
+				if (subdir) {
+					subdir.resubmitClearMessage(op, localOpMetadata);
+				}
+			},
+			applyStashedOp: (op: IDirectoryClearOperation): IClearLocalOpMetadata | undefined => {
+				const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
+				if (subdir) {
+					return subdir.applyStashedClearMessage(op);
+				}
+			},
+		});
+		this.messageHandlers.set("delete", {
+			process: (
+				msg: ISequencedDocumentMessage,
+				op: IDirectoryDeleteOperation,
+				local,
+				localOpMetadata,
+			) => {
+				const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
+				// If there is pending delete op for this subDirectory, then don't apply the this op as we are going
+				// to delete this subDirectory.
+				if (subdir && !this.isSubDirectoryDeletePending(op.path)) {
+					subdir.processDeleteMessage(msg, op, local, localOpMetadata);
+				}
+			},
+			submit: (op: IDirectoryDeleteOperation, localOpMetadata: unknown) => {
+				const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
+				if (subdir) {
+					subdir.resubmitKeyMessage(op, localOpMetadata);
+				}
+			},
+			applyStashedOp: (
+				op: IDirectoryDeleteOperation,
+			): IKeyEditLocalOpMetadata | undefined => {
+				const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
+				if (subdir) {
+					return subdir.applyStashedDeleteMessage(op);
+				}
+			},
+		});
+		this.messageHandlers.set("set", {
+			process: (
+				msg: ISequencedDocumentMessage,
+				op: IDirectorySetOperation,
+				local,
+				localOpMetadata,
+			) => {
+				const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
+				// If there is pending delete op for this subDirectory, then don't apply the this op as we are going
+				// to delete this subDirectory.
+				if (subdir && !this.isSubDirectoryDeletePending(op.path)) {
+					const context = local ? undefined : this.makeLocal(op.key, op.path, op.value);
+					subdir.processSetMessage(msg, op, context, local, localOpMetadata);
+				}
+			},
+			submit: (op: IDirectorySetOperation, localOpMetadata: unknown) => {
+				const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
+				if (subdir) {
+					subdir.resubmitKeyMessage(op, localOpMetadata);
+				}
+			},
+			applyStashedOp: (op: IDirectorySetOperation): IKeyEditLocalOpMetadata | undefined => {
+				const subdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
+				if (subdir) {
+					const context = this.makeLocal(op.key, op.path, op.value);
+					return subdir.applyStashedSetMessage(op, context);
+				}
+			},
+		});
+
+		this.messageHandlers.set("createSubDirectory", {
+			process: (
+				msg: ISequencedDocumentMessage,
+				op: IDirectoryCreateSubDirectoryOperation,
+				local,
+				localOpMetadata,
+			) => {
+				const parentSubdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
+				if (parentSubdir) {
+					parentSubdir.processCreateSubDirectoryMessage(msg, op, local, localOpMetadata);
+				}
+			},
+			submit: (op: IDirectoryCreateSubDirectoryOperation, localOpMetadata: unknown) => {
+				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.resubmitSubDirectoryMessage(op, localOpMetadata);
+				}
+			},
+			applyStashedOp: (
+				op: IDirectoryCreateSubDirectoryOperation,
+			): ICreateSubDirLocalOpMetadata | undefined => {
+				const parentSubdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
+				if (parentSubdir) {
+					return parentSubdir.applyStashedCreateSubDirMessage(op);
+				}
+			},
+		});
+
+		this.messageHandlers.set("deleteSubDirectory", {
+			process: (
+				msg: ISequencedDocumentMessage,
+				op: IDirectoryDeleteSubDirectoryOperation,
+				local,
+				localOpMetadata,
+			) => {
+				const parentSubdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
+				if (parentSubdir) {
+					parentSubdir.processDeleteSubDirectoryMessage(msg, op, local, localOpMetadata);
+				}
+			},
+			submit: (op: IDirectoryDeleteSubDirectoryOperation, localOpMetadata: unknown) => {
+				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.resubmitSubDirectoryMessage(op, localOpMetadata);
+				}
+			},
+			applyStashedOp: (
+				op: IDirectoryDeleteSubDirectoryOperation,
+			): IDeleteSubDirLocalOpMetadata | undefined => {
+				const parentSubdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
+				if (parentSubdir) {
+					return parentSubdir.applyStashedDeleteSubDirMessage(op);
+				}
+			},
+		});
+	}
+
+	/**
+	 * {@inheritDoc @fluidframework/shared-object-base#SharedObjectCore.applyStashedOp}
+	 * @internal
+	 */
+	protected applyStashedOp(op: unknown): unknown {
+		const handler = this.messageHandlers.get((op as IDirectoryOperation).type);
+		if (handler === undefined) {
+			throw new Error("no apply stashed op handler");
+		}
+		return handler.applyStashedOp(op as IDirectoryOperation);
+	}
+
+	private serializeDirectory(
+		root: SubDirectory,
+		serializer: IFluidSerializer,
+		telemetryContext?: ITelemetryContext,
+	): ISummaryTreeWithStats {
+		const MinValueSizeSeparateSnapshotBlob = 8 * 1024;
+
+		const builder = new SummaryTreeBuilder();
+		let counter = 0;
+		const blobs: string[] = [];
+
+		const stack: [SubDirectory, IDirectoryDataObject][] = [];
+		const content: IDirectoryDataObject = {};
+		stack.push([root, content]);
+
+		while (stack.length > 0) {
+			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+			const [currentSubDir, currentSubDirObject] = stack.pop()!;
+			currentSubDirObject.ci = currentSubDir.getSerializableCreateInfo();
+			for (const [key, value] of currentSubDir.getSerializedStorage(serializer)) {
+				if (!currentSubDirObject.storage) {
+					currentSubDirObject.storage = {};
+				}
+				const result: ISerializableValue = {
+					type: value.type,
+					value: value.value && (JSON.parse(value.value) as object),
+				};
+				if (value.value && value.value.length >= MinValueSizeSeparateSnapshotBlob) {
+					const extraContent: IDirectoryDataObject = {};
+					let largeContent = extraContent;
+					if (currentSubDir.absolutePath !== posix.sep) {
+						for (const dir of currentSubDir.absolutePath.slice(1).split(posix.sep)) {
+							const subDataObject: IDirectoryDataObject = {};
+							largeContent.subdirectories = { [dir]: subDataObject };
+							largeContent = subDataObject;
+						}
+					}
+					largeContent.storage = { [key]: result };
+					const blobName = `blob${counter}`;
+					counter++;
+					blobs.push(blobName);
+					builder.addBlob(blobName, JSON.stringify(extraContent));
+				} else {
+					currentSubDirObject.storage[key] = result;
+				}
+			}
+
+			for (const [subdirName, subdir] of currentSubDir.subdirectories()) {
+				if (!currentSubDirObject.subdirectories) {
+					currentSubDirObject.subdirectories = {};
+				}
+				const subDataObject: IDirectoryDataObject = {};
+				currentSubDirObject.subdirectories[subdirName] = subDataObject;
+				stack.push([subdir as SubDirectory, subDataObject]);
+			}
+		}
+
+		const newFormat: IDirectoryNewStorageFormat = {
+			blobs,
+			content,
+		};
+		builder.addBlob(snapshotFileName, JSON.stringify(newFormat));
+
+		return builder.getSummaryTree();
+	}
 }
 
 interface IKeyEditLocalOpMetadata {
-    type: "edit";
-    pendingMessageId: number;
-    previousValue: ILocalValue | undefined;
+	type: "edit";
+	pendingMessageId: number;
+	previousValue: ILocalValue | undefined;
 }
 
 interface IClearLocalOpMetadata {
-    type: "clear";
-    pendingMessageId: number;
-    previousStorage: Map<string, ILocalValue>;
+	type: "clear";
+	pendingMessageId: number;
+	previousStorage: Map<string, ILocalValue>;
 }
 
 interface ICreateSubDirLocalOpMetadata {
-    type: "createSubDir";
-    pendingMessageId: number;
-    previouslyExisted: boolean;
+	type: "createSubDir";
+	pendingMessageId: number;
 }
 
 interface IDeleteSubDirLocalOpMetadata {
-    type: "deleteSubDir";
-    pendingMessageId: number;
-    subDirectory: SubDirectory | undefined;
+	type: "deleteSubDir";
+	pendingMessageId: number;
+	subDirectory: SubDirectory | undefined;
 }
 
 type SubDirLocalOpMetadata = ICreateSubDirLocalOpMetadata | IDeleteSubDirLocalOpMetadata;
-type DirectoryLocalOpMetadata = IClearLocalOpMetadata | IKeyEditLocalOpMetadata | SubDirLocalOpMetadata;
+type DirectoryLocalOpMetadata =
+	| IClearLocalOpMetadata
+	| IKeyEditLocalOpMetadata
+	| SubDirLocalOpMetadata;
+
+/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access */
 
 function isKeyEditLocalOpMetadata(metadata: any): metadata is IKeyEditLocalOpMetadata {
-    return metadata !== undefined && typeof metadata.pendingMessageId === "number" && metadata.type === "edit";
+	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";
+	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");
+	return (
+		metadata !== undefined &&
+		typeof metadata.pendingMessageId === "number" &&
+		(metadata.type === "createSubDir" || 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"));
+	return (
+		metadata !== undefined &&
+		typeof metadata.pendingMessageId === "number" &&
+		(metadata.type === "edit" ||
+			metadata.type === "deleteSubDir" ||
+			(metadata.type === "clear" && typeof metadata.previousStorage === "object") ||
+			metadata.type === "createSubDir")
+	);
 }
 
+/* eslint-enable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access */
+
 /**
  * Node of the directory tree.
  * @sealed
  */
 class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirectory {
-    /**
-     * Tells if the sub directory is deleted or not.
-     */
-    private _deleted = false;
-
-    /**
-     * String representation for the class.
-     */
-    public [Symbol.toStringTag]: string = "SubDirectory";
-
-    /**
-     * The in-memory data the directory is storing.
-     */
-    private readonly _storage: Map<string, ILocalValue> = new Map();
-
-    /**
-     * The subdirectories the directory is holding.
-     */
-    private readonly _subdirectories: Map<string, SubDirectory> = new Map();
-
-    /**
-     * Keys that have been modified locally but not yet ack'd from the server.
-     */
-    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();
-
-    /**
-     * This is used to assign a unique id to every outgoing operation and helps in tracking unack'd ops.
-     */
-    private pendingMessageId: number = -1;
-
-    /**
-     * The pending ids of any clears that have been performed locally but not yet ack'd from the server
-     */
-    private readonly pendingClearMessageIds: number[] = [];
-
-    /**
-     * Constructor.
-     * @param directory - Reference back to the SharedDirectory to perform operations
-     * @param runtime - The data store runtime this directory is associated with
-     * @param serializer - The serializer to serialize / parse handles
-     * @param absolutePath - The absolute path of this IDirectory
-     */
-    constructor(
-        private readonly directory: SharedDirectory,
-        private readonly runtime: IFluidDataStoreRuntime,
-        private readonly serializer: IFluidSerializer,
-        public readonly absolutePath: string,
-    ) {
-        super();
-    }
-
-    public dispose(error?: Error): void {
-        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._deleted;
-    }
-
-    private throwIfDisposed() {
-        if (this._deleted) {
-            throw new UsageError("Cannot access Disposed subDirectory");
-        }
-    }
-
-    /**
-     * Checks whether the given key exists in this IDirectory.
-     * @param key - The key to check
-     * @returns True if the key exists, false otherwise
-     */
-    public has(key: string): boolean {
-        this.throwIfDisposed();
-        return this._storage.has(key);
-    }
-
-    /**
-     * {@inheritDoc IDirectory.get}
-     */
-    public get<T = any>(key: string): T | undefined {
-        this.throwIfDisposed();
-        return this._storage.get(key)?.value as T | undefined;
-    }
-
-    /**
-     * {@inheritDoc IDirectory.set}
-     */
-    public set<T = any>(key: string, value: T): this {
-        this.throwIfDisposed();
-        // Undefined/null keys can't be serialized to JSON in the manner we currently snapshot.
-        if (key === undefined || key === null) {
-            throw new Error("Undefined and null keys are not supported");
-        }
-
-        // Create a local value and serialize it.
-        const localValue = this.directory.localValueMaker.fromInMemory(value);
-        const serializableValue = makeSerializable(
-            localValue,
-            this.serializer,
-            this.directory.handle);
-
-        // Set the value locally.
-        const previousValue = this.setCore(
-            key,
-            localValue,
-            true,
-        );
-
-        // If we are not attached, don't submit the op.
-        if (!this.directory.isAttached()) {
-            return this;
-        }
-
-        const op: IDirectorySetOperation = {
-            key,
-            path: this.absolutePath,
-            type: "set",
-            value: serializableValue,
-        };
-        this.submitKeyMessage(op, previousValue);
-        return this;
-    }
-
-    /**
-     * {@inheritDoc IDirectory.countSubDirectory}
-     */
-    public countSubDirectory(): number {
-        return this._subdirectories.size;
-    }
-
-    /**
-     * {@inheritDoc IDirectory.createSubDirectory}
-     */
-    public createSubDirectory(subdirName: string): IDirectory {
-        this.throwIfDisposed();
-        // Undefined/null subdirectory names can't be serialized to JSON in the manner we currently snapshot.
-        if (subdirName === undefined || subdirName === null) {
-            throw new Error("SubDirectory name may not be undefined or null");
-        }
-
-        if (subdirName.includes(posix.sep)) {
-            throw new Error(`SubDirectory name may not contain ${posix.sep}`);
-        }
-
-        // Create the sub directory locally first.
-        const isNew = this.createSubDirectoryCore(subdirName, true);
-
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        const subDir: IDirectory = this._subdirectories.get(subdirName)!;
-
-        // If we are not attached, don't submit the op.
-        if (!this.directory.isAttached()) {
-            return subDir;
-        }
-
-        const op: IDirectoryCreateSubDirectoryOperation = {
-            path: this.absolutePath,
-            subdirName,
-            type: "createSubDirectory",
-        };
-        this.submitCreateSubDirectoryMessage(op, !isNew);
-
-        return subDir;
-    }
-
-    /**
-     * {@inheritDoc IDirectory.getSubDirectory}
-     */
-    public getSubDirectory(subdirName: string): IDirectory | undefined {
-        this.throwIfDisposed();
-        return this._subdirectories.get(subdirName);
-    }
-
-    /**
-     * {@inheritDoc IDirectory.hasSubDirectory}
-     */
-    public hasSubDirectory(subdirName: string): boolean {
-        this.throwIfDisposed();
-        return this._subdirectories.has(subdirName);
-    }
-
-    /**
-     * {@inheritDoc IDirectory.deleteSubDirectory}
-     */
-    public deleteSubDirectory(subdirName: string): boolean {
-        this.throwIfDisposed();
-        // Delete the sub directory locally first.
-        const subDir = this.deleteSubDirectoryCore(subdirName, true);
-
-        // If we are not attached, don't submit the op.
-        if (!this.directory.isAttached()) {
-            return subDir !== undefined;
-        }
-
-        const op: IDirectoryDeleteSubDirectoryOperation = {
-            path: this.absolutePath,
-            subdirName,
-            type: "deleteSubDirectory",
-        };
-
-        this.submitDeleteSubDirectoryMessage(op, subDir);
-        return subDir !== undefined;
-    }
-
-    /**
-     * {@inheritDoc IDirectory.subdirectories}
-     */
-    public subdirectories(): IterableIterator<[string, IDirectory]> {
-        this.throwIfDisposed();
-        return this._subdirectories.entries();
-    }
-
-    /**
-     * {@inheritDoc IDirectory.getWorkingDirectory}
-     */
-    public getWorkingDirectory(relativePath: string): IDirectory | undefined {
-        this.throwIfDisposed();
-        return this.directory.getWorkingDirectory(this.makeAbsolute(relativePath));
-    }
-
-    /**
-     * Deletes the given key from within this IDirectory.
-     * @param key - The key to delete
-     * @returns True if the key existed and was deleted, false if it did not exist
-     */
-    public delete(key: string): boolean {
-        this.throwIfDisposed();
-        // Delete the key locally first.
-        const previousValue = this.deleteCore(key, true);
-
-        // If we are not attached, don't submit the op.
-        if (!this.directory.isAttached()) {
-            return previousValue !== undefined;
-        }
-
-        const op: IDirectoryDeleteOperation = {
-            key,
-            path: this.absolutePath,
-            type: "delete",
-        };
-
-        this.submitKeyMessage(op, previousValue);
-        return previousValue !== undefined;
-    }
-
-    /**
-     * Deletes all keys from within this IDirectory.
-     */
-    public clear(): void {
-        this.throwIfDisposed();
-
-        // 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, copy);
-    }
-
-    /**
-     * Issue a callback on each entry under this IDirectory.
-     * @param callback - Callback to issue
-     */
-    public forEach(callback: (value: any, key: string, map: Map<string, any>) => void): void {
-        this.throwIfDisposed();
-        this._storage.forEach((localValue, key, map) => {
-            callback(localValue.value, key, map);
-        });
-    }
-
-    /**
-     * The number of entries under this IDirectory.
-     */
-    public get size(): number {
-        this.throwIfDisposed();
-        return this._storage.size;
-    }
-
-    /**
-     * Get an iterator over the entries under this IDirectory.
-     * @returns The iterator
-     */
-    public entries(): IterableIterator<[string, any]> {
-        this.throwIfDisposed();
-        const localEntriesIterator = this._storage.entries();
-        const iterator = {
-            next(): IteratorResult<[string, any]> {
-                const nextVal = localEntriesIterator.next();
-                return nextVal.done
-                    ? { value: undefined, done: true }
-                    : { value: [nextVal.value[0], nextVal.value[1].value], done: false };
-            },
-            [Symbol.iterator]() {
-                return this;
-            },
-        };
-        return iterator;
-    }
-
-    /**
-     * Get an iterator over the keys under this IDirectory.
-     * @returns The iterator
-     */
-    public keys(): IterableIterator<string> {
-        this.throwIfDisposed();
-        return this._storage.keys();
-    }
-
-    /**
-     * Get an iterator over the values under this IDirectory.
-     * @returns The iterator
-     */
-    public values(): IterableIterator<any> {
-        this.throwIfDisposed();
-        const localValuesIterator = this._storage.values();
-        const iterator = {
-            next(): IteratorResult<any> {
-                const nextVal = localValuesIterator.next();
-                return nextVal.done
-                    ? { value: undefined, done: true }
-                    : { value: nextVal.value.value, done: false };
-            },
-            [Symbol.iterator]() {
-                return this;
-            },
-        };
-        return iterator;
-    }
-
-    /**
-     * Get an iterator over the entries under this IDirectory.
-     * @returns The iterator
-     */
-    public [Symbol.iterator](): IterableIterator<[string, any]> {
-        this.throwIfDisposed();
-        return this.entries();
-    }
-
-    /**
-     * Process a clear operation.
-     * @param op - The op to process
-     * @param local - Whether the message originated from the local client
-     * @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.
-     * @internal
-     */
-    public processClearMessage(
-        op: IDirectoryClearOperation,
-        local: boolean,
-        localOpMetadata: unknown,
-    ): void {
-        this.throwIfDisposed();
-        if (local) {
-            assert(isClearLocalOpMetadata(localOpMetadata),
-                0x00f /* pendingMessageId is missing from the local client's operation */);
-            const pendingClearMessageId = this.pendingClearMessageIds.shift();
-            assert(pendingClearMessageId === localOpMetadata.pendingMessageId,
-                0x32a /* pendingMessageId does not match */);
-            return;
-        }
-        this.clearExceptPendingKeys(false);
-    }
-
-    /**
-     * Apply clear operation locally and generate metadata
-     * @param op - Op to apply
-     * @returns metadata generated for stahed op
-     */
-    public applyStashedClearMessage(op: IDirectoryClearOperation): IClearLocalOpMetadata {
-        this.throwIfDisposed();
-        const previousValue = new Map<string, ILocalValue>(this._storage);
-        this.clearExceptPendingKeys(true);
-        const pendingMsgId = ++this.pendingMessageId;
-        this.pendingClearMessageIds.push(pendingMsgId);
-        const metadata: IClearLocalOpMetadata = {
-            type: "clear",
-            pendingMessageId: pendingMsgId,
-            previousStorage: previousValue,
-        };
-        return metadata;
-    }
-
-    /**
-     * Process a delete operation.
-     * @param op - The op to process
-     * @param local - Whether the message originated from the local client
-     * @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.
-     * @internal
-     */
-    public processDeleteMessage(
-        op: IDirectoryDeleteOperation,
-        local: boolean,
-        localOpMetadata: unknown,
-    ): void {
-        this.throwIfDisposed();
-        if (!this.needProcessStorageOperation(op, local, localOpMetadata)) {
-            return;
-        }
-        this.deleteCore(op.key, local);
-    }
-
-    /**
-     * Apply delete operation locally and generate metadata
-     * @param op - Op to apply
-     * @returns metadata generated for stahed op
-     */
-    public applyStashedDeleteMessage(op: IDirectoryDeleteOperation): IKeyEditLocalOpMetadata {
-        this.throwIfDisposed();
-        const previousValue = this.deleteCore(op.key, true);
-        const pendingMessageId = this.getKeyMessageId(op);
-        const localMetadata: IKeyEditLocalOpMetadata = { type: "edit", pendingMessageId, previousValue };
-        return localMetadata;
-    }
-
-    /**
-     * Process a set operation.
-     * @param op - The op to process
-     * @param local - Whether the message originated from the local client
-     * @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.
-     * @internal
-     */
-    public processSetMessage(
-        op: IDirectorySetOperation,
-        context: ILocalValue | undefined,
-        local: boolean,
-        localOpMetadata: unknown,
-    ): void {
-        this.throwIfDisposed();
-        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);
-    }
-
-    /**
-     * Apply set operation locally and generate metadata
-     * @param op - Op to apply
-     * @returns metadata generated for stahed op
-     */
-    public applyStashedSetMessage(op: IDirectorySetOperation, context: ILocalValue): IKeyEditLocalOpMetadata {
-        this.throwIfDisposed();
-        // Set the value locally.
-        const previousValue = this.setCore(
-            op.key,
-            context,
-            true,
-        );
-
-        // Create metadata
-        const pendingMessageId = this.getKeyMessageId(op);
-        const localMetadata: IKeyEditLocalOpMetadata = { type: "edit", pendingMessageId, previousValue };
-        return localMetadata;
-    }
-    /**
-     * Process a create subdirectory operation.
-     * @param op - The op to process
-     * @param local - Whether the message originated from the local client
-     * @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.
-     * @internal
-     */
-    public processCreateSubDirectoryMessage(
-        op: IDirectoryCreateSubDirectoryOperation,
-        local: boolean,
-        localOpMetadata: unknown,
-    ): void {
-        this.throwIfDisposed();
-        if (!this.needProcessSubDirectoryOperation(op, local, localOpMetadata)) {
-            return;
-        }
-        this.createSubDirectoryCore(op.subdirName, local);
-    }
-
-    /**
-     * Apply createSubDirectory operation locally and generate metadata
-     * @param op - Op to apply
-     * @returns metadata generated for stahed op
-     */
-    public applyStashedCreateSubDirMessage(op: IDirectoryCreateSubDirectoryOperation):
-    ICreateSubDirLocalOpMetadata {
-        this.throwIfDisposed();
-        // Create the sub directory locally first.
-        const isNew = this.createSubDirectoryCore(op.subdirName, true);
-        const newMessageId = this.getSubDirMessageId(op);
-
-        const localOpMetadata: ICreateSubDirLocalOpMetadata = {
-            type: "createSubDir",
-            pendingMessageId: newMessageId,
-            previouslyExisted: !isNew,
-        };
-        return localOpMetadata;
-    }
-
-    /**
-     * Process a delete subdirectory operation.
-     * @param op - The op to process
-     * @param local - Whether the message originated from the local client
-     * @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.
-     * @internal
-     */
-    public processDeleteSubDirectoryMessage(
-        op: IDirectoryDeleteSubDirectoryOperation,
-        local: boolean,
-        localOpMetadata: unknown,
-    ): void {
-        this.throwIfDisposed();
-        if (!this.needProcessSubDirectoryOperation(op, local, localOpMetadata)) {
-            return;
-        }
-        this.deleteSubDirectoryCore(op.subdirName, local);
-    }
-
-    /**
-     * Apply deleteSubDirectory operation locally and generate metadata
-     * @param op - Op to apply
-     * @returns metadata generated for stahed op
-     */
-    public applyStashedDeleteSubDirMessage(op: IDirectoryDeleteSubDirectoryOperation): IDeleteSubDirLocalOpMetadata {
-        this.throwIfDisposed();
-        const subDir = this.deleteSubDirectoryCore(op.subdirName, true);
-        const newMessageId = this.getSubDirMessageId(op);
-        const metadata: IDeleteSubDirLocalOpMetadata = {
-            type: "deleteSubDir",
-            pendingMessageId: newMessageId,
-            subDirectory: subDir,
-        };
-        return metadata;
-    }
-
-    /**
-     * Submit a clear operation.
-     * @param op - The operation
-     */
-    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), 0x32b /* 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,
-            0x32c /* 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;
-        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 resubmitKeyMessage(op: IDirectoryKeyOperation, localOpMetadata: unknown): void {
-        assert(isKeyEditLocalOpMetadata(localOpMetadata), 0x32d /* Invalid localOpMetadata in submit */);
-
-        // clear the old pending message id
-        const pendingMessageIds = this.pendingKeys.get(op.key);
-        assert(pendingMessageIds !== undefined && pendingMessageIds[0] === localOpMetadata.pendingMessageId,
-            0x32e /* 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 newMessageId = this.getSubDirMessageId(op);
-
-        const localOpMetadata: ICreateSubDirLocalOpMetadata = {
-            type: "createSubDir",
-            pendingMessageId: newMessageId,
-            previouslyExisted: prevExisted,
-        };
-        this.directory.submitDirectoryMessage(op, localOpMetadata);
-    }
-
-    /**
-     * Submit a delete subdirectory operation.
-     * @param op - The operation
-     * @param subDir - Any subdirectory deleted by the op
-     */
-    private submitDeleteSubDirectoryMessage(op: IDirectorySubDirectoryOperation,
-        subDir: SubDirectory | undefined): void {
-        this.throwIfDisposed();
-        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), 0x32f /* 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,
-            0x330 /* 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);
-        }
-    }
-
-    /**
-     * Get the storage of this subdirectory in a serializable format, to be used in snapshotting.
-     * @param serializer - The serializer to use to serialize handles in its values.
-     * @returns The JSONable string representing the storage of this subdirectory
-     * @internal
-     */
-    public *getSerializedStorage(serializer: IFluidSerializer) {
-        this.throwIfDisposed();
-        for (const [key, localValue] of this._storage) {
-            const value = localValue.makeSerialized(serializer, this.directory.handle);
-            const res: [string, ISerializedValue] = [key, value];
-            yield res;
-        }
-    }
-
-    /**
-     * Populate a key value in this subdirectory's storage, to be used when loading from snapshot.
-     * @param key - The key to populate
-     * @param localValue - The local value to populate into it
-     * @internal
-     */
-    public populateStorage(key: string, localValue: ILocalValue): void {
-        this.throwIfDisposed();
-        this._storage.set(key, localValue);
-    }
-
-    /**
-     * Populate a subdirectory into this subdirectory, to be used when loading from snapshot.
-     * @param subdirName - The name of the subdirectory to add
-     * @param newSubDir - The new subdirectory to add
-     * @internal
-     */
-    public populateSubDirectory(subdirName: string, newSubDir: SubDirectory): void {
-        this.throwIfDisposed();
-        this._subdirectories.set(subdirName, newSubDir);
-    }
-
-    /**
-     * Retrieve the local value at the given key.  This is used to get value type information stashed on the local
-     * value so op handlers can be retrieved
-     * @param key - The key to retrieve from
-     * @returns The local value
-     * @internal
-     */
-    public getLocalValue<T extends ILocalValue = ILocalValue>(key: string): T {
-        this.throwIfDisposed();
-        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
-     * @returns The equivalent absolute path
-     */
-    private makeAbsolute(relativePath: string): string {
-        return posix.resolve(this.absolutePath, relativePath);
-    }
-
-    /**
-     * 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 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(
-        op: IDirectoryKeyOperation,
-        local: boolean,
-        localOpMetadata: unknown,
-    ): boolean {
-        if (this.pendingClearMessageIds.length > 0) {
-            if (local) {
-                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.
-            return false;
-        }
-
-        const pendingKeyMessageId = this.pendingKeys.get(op.key);
-        if (pendingKeyMessageId !== 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) {
-                assert(localOpMetadata !== undefined && isKeyEditLocalOpMetadata(localOpMetadata),
-                    0x011 /* pendingMessageId is missing from the local client's operation */);
-                const pendingMessageIds = this.pendingKeys.get(op.key);
-                assert(pendingMessageIds !== undefined && pendingMessageIds[0] === localOpMetadata.pendingMessageId,
-                    0x331 /* Unexpected pending message received */);
-                pendingMessageIds.shift();
-                if (pendingMessageIds.length === 0) {
-                    this.pendingKeys.delete(op.key);
-                }
-            }
-            return false;
-        }
-
-        // If we don't have a NACK op on the key, we need to process the remote ops.
-        return !local;
-    }
-
-    /**
-     * 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.
-     * @returns True if the operation should be processed, false otherwise
-     */
-    private needProcessSubDirectoryOperation(
-        op: IDirectorySubDirectoryOperation,
-        local: boolean,
-        localOpMetadata: unknown,
-    ): boolean {
-        const pendingSubDirectoryMessageId = this.pendingSubDirectories.get(op.subdirName);
-        if (pendingSubDirectoryMessageId !== undefined) {
-            if (local) {
-                assert(isSubDirLocalOpMetadata(localOpMetadata),
-                    0x012 /* pendingMessageId is missing from the local client's operation */);
-                const pendingMessageIds = this.pendingSubDirectories.get(op.subdirName);
-                assert(pendingMessageIds !== undefined && pendingMessageIds[0] === localOpMetadata.pendingMessageId,
-                    0x332 /* Unexpected pending message received */);
-                pendingMessageIds.shift();
-                if (pendingMessageIds.length === 0) {
-                    this.pendingSubDirectories.delete(op.subdirName);
-                }
-            }
-            return false;
-        }
-
-        return !local;
-    }
-
-    /**
-     * Clear all keys in memory in response to a remote clear, but retain keys we have modified but not yet been ack'd.
-     */
-    private clearExceptPendingKeys(local: boolean) {
-        // 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>();
-        this.pendingKeys.forEach((value, key, map) => {
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            temp.set(key, this._storage.get(key)!);
-        });
-        this.clearCore(local);
-        temp.forEach((value, key, map) => {
-            this.setCore(key, value, true);
-        });
-    }
-
-    /**
-     * Clear implementation used for both locally sourced clears as well as incoming remote clears.
-     * @param local - Whether the message originated from the local client
-     */
-    private clearCore(local: boolean) {
-        this._storage.clear();
-        this.directory.emit("clear", local, this.directory);
-    }
-
-    /**
-     * 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
-     * @returns Previous local value of the key if it existed, undefined if it did not exist
-     */
-    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 };
-            this.directory.emit("valueChanged", event, local, this.directory);
-            const containedEvent: IValueChanged = { key, previousValue };
-            this.emit("containedValueChanged", containedEvent, local, this);
-        }
-        return previousLocalValue;
-    }
-
-    /**
-     * Set implementation used for both locally sourced sets as well as incoming remote sets.
-     * @param key - The key being set
-     * @param value - The value being set
-     * @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 {
-        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): 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) {
-        subDirectory.on("subDirectoryCreated", (relativePath: string, local: boolean) => {
-            this.emit("subDirectoryCreated", posix.join(subDirName, relativePath), local, this);
-        });
-        subDirectory.on("subDirectoryDeleted", (relativePath: string, local: boolean) => {
-            this.emit("subDirectoryDeleted", posix.join(subDirName, relativePath), local, this);
-        });
-    }
-
-    /**
-     * 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
-     */
-    private deleteSubDirectoryCore(subdirName: string, local: boolean) {
-        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? But not when rollback.
-        if (previousValue !== undefined) {
-            this._subdirectories.delete(subdirName);
-            this.disposeSubDirectoryTree(previousValue);
-            this.emit("subDirectoryDeleted", subdirName, local, this);
-        }
-        return previousValue;
-    }
-
-    private disposeSubDirectoryTree(directory: IDirectory | undefined) {
-        if (!directory) {
-            return;
-        }
-        // Dispose the subdirectory tree. This will dispose the subdirectories from bottom to top.
-        const subDirectories = directory.subdirectories();
-        for (const [_, subDirectory] of subDirectories) {
-            this.disposeSubDirectoryTree(subDirectory);
-        }
-        if (typeof directory.dispose === "function") {
-            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();
-    }
+	/**
+	 * Tells if the sub directory is deleted or not.
+	 */
+	private _deleted = false;
+
+	/**
+	 * String representation for the class.
+	 */
+	public [Symbol.toStringTag]: string = "SubDirectory";
+
+	/**
+	 * The in-memory data the directory is storing.
+	 */
+	private readonly _storage: Map<string, ILocalValue> = new Map();
+
+	/**
+	 * The subdirectories the directory is holding.
+	 */
+	private readonly _subdirectories: Map<string, SubDirectory> = new Map();
+
+	/**
+	 * Keys that have been modified locally but not yet ack'd from the server.
+	 */
+	private readonly pendingKeys: Map<string, number[]> = new Map();
+
+	/**
+	 * Subdirectories that have been created/deleted locally but not yet ack'd from the server.
+	 */
+	private readonly pendingSubDirectories: Map<string, number[]> = new Map();
+
+	/**
+	 * Subdirectories that have been deleted locally but not yet ack'd from the server. This maintains the count
+	 * of delete op that are pending or yet to be acked from server.
+	 */
+	private readonly pendingDeleteSubDirectoriesCount: Map<string, number> = new Map();
+
+	/**
+	 * This is used to assign a unique id to every outgoing operation and helps in tracking unack'd ops.
+	 */
+	private pendingMessageId: number = -1;
+
+	/**
+	 * The pending ids of any clears that have been performed locally but not yet ack'd from the server
+	 */
+	private readonly pendingClearMessageIds: number[] = [];
+
+	/**
+	 * Constructor.
+	 * @param sequenceNumber - Message seq number at which this was created.
+	 * @param clientIds - Ids of client which created this directory.
+	 * @param directory - Reference back to the SharedDirectory to perform operations
+	 * @param runtime - The data store runtime this directory is associated with
+	 * @param serializer - The serializer to serialize / parse handles
+	 * @param absolutePath - The absolute path of this IDirectory
+	 */
+	public constructor(
+		private sequenceNumber: number,
+		private readonly clientIds: Set<string>,
+		private readonly directory: SharedDirectory,
+		private readonly runtime: IFluidDataStoreRuntime,
+		private readonly serializer: IFluidSerializer,
+		public readonly absolutePath: string,
+	) {
+		super();
+	}
+
+	public dispose(error?: Error): void {
+		this._deleted = true;
+		this.emit("disposed", this);
+	}
+
+	/**
+	 * Unmark the deleted property only when rolling back delete.
+	 */
+	private undispose(): void {
+		this._deleted = false;
+		this.emit("undisposed", this);
+	}
+
+	public get disposed(): boolean {
+		return this._deleted;
+	}
+
+	private throwIfDisposed(): void {
+		if (this._deleted) {
+			throw new UsageError("Cannot access Disposed subDirectory");
+		}
+	}
+
+	/**
+	 * Checks whether the given key exists in this IDirectory.
+	 * @param key - The key to check
+	 * @returns True if the key exists, false otherwise
+	 */
+	public has(key: string): boolean {
+		this.throwIfDisposed();
+		return this._storage.has(key);
+	}
+
+	/**
+	 * {@inheritDoc IDirectory.get}
+	 */
+	public get<T = unknown>(key: string): T | undefined {
+		this.throwIfDisposed();
+		return this._storage.get(key)?.value as T | undefined;
+	}
+
+	/**
+	 * {@inheritDoc IDirectory.set}
+	 */
+	public set<T = unknown>(key: string, value: T): this {
+		this.throwIfDisposed();
+		// Undefined/null keys can't be serialized to JSON in the manner we currently snapshot.
+		if (key === undefined || key === null) {
+			throw new Error("Undefined and null keys are not supported");
+		}
+
+		// Create a local value and serialize it.
+		const localValue = this.directory.localValueMaker.fromInMemory(value);
+		const serializableValue = makeSerializable(
+			localValue,
+			this.serializer,
+			this.directory.handle,
+		);
+
+		// Set the value locally.
+		const previousValue = this.setCore(key, localValue, true);
+
+		// If we are not attached, don't submit the op.
+		if (!this.directory.isAttached()) {
+			return this;
+		}
+
+		const op: IDirectorySetOperation = {
+			key,
+			path: this.absolutePath,
+			type: "set",
+			value: serializableValue,
+		};
+		this.submitKeyMessage(op, previousValue);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc IDirectory.countSubDirectory}
+	 */
+	public countSubDirectory(): number {
+		return this._subdirectories.size;
+	}
+
+	/**
+	 * {@inheritDoc IDirectory.createSubDirectory}
+	 */
+	public createSubDirectory(subdirName: string): IDirectory {
+		this.throwIfDisposed();
+		// Undefined/null subdirectory names can't be serialized to JSON in the manner we currently snapshot.
+		if (subdirName === undefined || subdirName === null) {
+			throw new Error("SubDirectory name may not be undefined or null");
+		}
+
+		if (subdirName.includes(posix.sep)) {
+			throw new Error(`SubDirectory name may not contain ${posix.sep}`);
+		}
+
+		// Create the sub directory locally first.
+		const isNew = this.createSubDirectoryCore(
+			subdirName,
+			true,
+			-1,
+			this.runtime.clientId ?? "detached",
+		);
+		const subDir = this._subdirectories.get(subdirName);
+		assert(subDir !== undefined, 0x5aa /* subdirectory should exist after creation */);
+
+		// If we are not attached, don't submit the op.
+		if (!this.directory.isAttached()) {
+			return subDir;
+		}
+
+		// Only submit the op, if it is newly created.
+		if (isNew) {
+			const op: IDirectoryCreateSubDirectoryOperation = {
+				path: this.absolutePath,
+				subdirName,
+				type: "createSubDirectory",
+			};
+			this.submitCreateSubDirectoryMessage(op);
+		}
+
+		return subDir;
+	}
+
+	/**
+	 * {@inheritDoc IDirectory.getSubDirectory}
+	 */
+	public getSubDirectory(subdirName: string): IDirectory | undefined {
+		this.throwIfDisposed();
+		return this._subdirectories.get(subdirName);
+	}
+
+	/**
+	 * {@inheritDoc IDirectory.hasSubDirectory}
+	 */
+	public hasSubDirectory(subdirName: string): boolean {
+		this.throwIfDisposed();
+		return this._subdirectories.has(subdirName);
+	}
+
+	/**
+	 * {@inheritDoc IDirectory.deleteSubDirectory}
+	 */
+	public deleteSubDirectory(subdirName: string): boolean {
+		this.throwIfDisposed();
+		// Delete the sub directory locally first.
+		const subDir = this.deleteSubDirectoryCore(subdirName, true);
+
+		// If we are not attached, don't submit the op.
+		if (!this.directory.isAttached()) {
+			return subDir !== undefined;
+		}
+
+		// Only submit the op, if the directory existed and we deleted it.
+		if (subDir !== undefined) {
+			const op: IDirectoryDeleteSubDirectoryOperation = {
+				path: this.absolutePath,
+				subdirName,
+				type: "deleteSubDirectory",
+			};
+
+			this.submitDeleteSubDirectoryMessage(op, subDir);
+		}
+		return subDir !== undefined;
+	}
+
+	/**
+	 * {@inheritDoc IDirectory.subdirectories}
+	 */
+	public subdirectories(): IterableIterator<[string, IDirectory]> {
+		this.throwIfDisposed();
+		return this._subdirectories.entries();
+	}
+
+	/**
+	 * {@inheritDoc IDirectory.getWorkingDirectory}
+	 */
+	public getWorkingDirectory(relativePath: string): IDirectory | undefined {
+		this.throwIfDisposed();
+		return this.directory.getWorkingDirectory(this.makeAbsolute(relativePath));
+	}
+
+	/**
+	 * This checks if there is pending delete op for local delete for a given child subdirectory.
+	 * @param subDirName - directory name.
+	 * @returns - true if there is pending delete.
+	 */
+	public isSubDirectoryDeletePending(subDirName: string): boolean {
+		const pendingDeleteSubDirectory = this.pendingDeleteSubDirectoriesCount.get(subDirName);
+		if (pendingDeleteSubDirectory !== undefined && pendingDeleteSubDirectory > 0) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Deletes the given key from within this IDirectory.
+	 * @param key - The key to delete
+	 * @returns True if the key existed and was deleted, false if it did not exist
+	 */
+	public delete(key: string): boolean {
+		this.throwIfDisposed();
+		// Delete the key locally first.
+		const previousValue = this.deleteCore(key, true);
+
+		// If we are not attached, don't submit the op.
+		if (!this.directory.isAttached()) {
+			return previousValue !== undefined;
+		}
+
+		const op: IDirectoryDeleteOperation = {
+			key,
+			path: this.absolutePath,
+			type: "delete",
+		};
+
+		this.submitKeyMessage(op, previousValue);
+		return previousValue !== undefined;
+	}
+
+	/**
+	 * Deletes all keys from within this IDirectory.
+	 */
+	public clear(): void {
+		this.throwIfDisposed();
+
+		// 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, copy);
+	}
+
+	/**
+	 * Issue a callback on each entry under this IDirectory.
+	 * @param callback - Callback to issue
+	 */
+	public forEach(
+		callback: (value: unknown, key: string, map: Map<string, unknown>) => void,
+	): void {
+		this.throwIfDisposed();
+		// eslint-disable-next-line unicorn/no-array-for-each
+		this._storage.forEach((localValue, key, map) => {
+			callback(localValue.value, key, map);
+		});
+	}
+
+	/**
+	 * The number of entries under this IDirectory.
+	 */
+	public get size(): number {
+		this.throwIfDisposed();
+		return this._storage.size;
+	}
+
+	/**
+	 * Get an iterator over the entries under this IDirectory.
+	 * @returns The iterator
+	 */
+	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;
+	}
+
+	/**
+	 * Get an iterator over the keys under this IDirectory.
+	 * @returns The iterator
+	 */
+	public keys(): IterableIterator<string> {
+		this.throwIfDisposed();
+		return this._storage.keys();
+	}
+
+	/**
+	 * Get an iterator over the values under this IDirectory.
+	 * @returns The iterator
+	 */
+	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;
+	}
+
+	/**
+	 * Get an iterator over the entries under this IDirectory.
+	 * @returns The iterator
+	 */
+	public [Symbol.iterator](): IterableIterator<[string, unknown]> {
+		this.throwIfDisposed();
+		return this.entries();
+	}
+
+	/**
+	 * Process a clear operation.
+	 * @param msg - The message from the server to apply.
+	 * @param op - The op to process
+	 * @param local - Whether the message originated from the local client
+	 * @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.
+	 * @internal
+	 */
+	public processClearMessage(
+		msg: ISequencedDocumentMessage,
+		op: IDirectoryClearOperation,
+		local: boolean,
+		localOpMetadata: unknown,
+	): void {
+		this.throwIfDisposed();
+		if (!this.isMessageForCurrentInstanceOfSubDirectory(msg)) {
+			return;
+		}
+		if (local) {
+			assert(
+				isClearLocalOpMetadata(localOpMetadata),
+				0x00f /* pendingMessageId is missing from the local client's operation */,
+			);
+			const pendingClearMessageId = this.pendingClearMessageIds.shift();
+			assert(
+				pendingClearMessageId === localOpMetadata.pendingMessageId,
+				0x32a /* pendingMessageId does not match */,
+			);
+			return;
+		}
+		this.clearExceptPendingKeys(false);
+	}
+
+	/**
+	 * Apply clear operation locally and generate metadata
+	 * @param op - Op to apply
+	 * @returns metadata generated for stahed op
+	 */
+	public applyStashedClearMessage(op: IDirectoryClearOperation): IClearLocalOpMetadata {
+		this.throwIfDisposed();
+		const previousValue = new Map<string, ILocalValue>(this._storage);
+		this.clearExceptPendingKeys(true);
+		const pendingMsgId = ++this.pendingMessageId;
+		this.pendingClearMessageIds.push(pendingMsgId);
+		const metadata: IClearLocalOpMetadata = {
+			type: "clear",
+			pendingMessageId: pendingMsgId,
+			previousStorage: previousValue,
+		};
+		return metadata;
+	}
+
+	/**
+	 * Process a delete operation.
+	 * @param msg - The message from the server to apply.
+	 * @param op - The op to process
+	 * @param local - Whether the message originated from the local client
+	 * @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.
+	 * @internal
+	 */
+	public processDeleteMessage(
+		msg: ISequencedDocumentMessage,
+		op: IDirectoryDeleteOperation,
+		local: boolean,
+		localOpMetadata: unknown,
+	): void {
+		this.throwIfDisposed();
+		if (
+			!(
+				this.isMessageForCurrentInstanceOfSubDirectory(msg) &&
+				this.needProcessStorageOperation(op, local, localOpMetadata)
+			)
+		) {
+			return;
+		}
+		this.deleteCore(op.key, local);
+	}
+
+	/**
+	 * Apply delete operation locally and generate metadata
+	 * @param op - Op to apply
+	 * @returns metadata generated for stahed op
+	 */
+	public applyStashedDeleteMessage(op: IDirectoryDeleteOperation): IKeyEditLocalOpMetadata {
+		this.throwIfDisposed();
+		const previousValue = this.deleteCore(op.key, true);
+		const pendingMessageId = this.getKeyMessageId(op);
+		const localMetadata: IKeyEditLocalOpMetadata = {
+			type: "edit",
+			pendingMessageId,
+			previousValue,
+		};
+		return localMetadata;
+	}
+
+	/**
+	 * Process a set operation.
+	 * @param msg - The message from the server to apply.
+	 * @param op - The op to process
+	 * @param local - Whether the message originated from the local client
+	 * @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.
+	 * @internal
+	 */
+	public processSetMessage(
+		msg: ISequencedDocumentMessage,
+		op: IDirectorySetOperation,
+		context: ILocalValue | undefined,
+		local: boolean,
+		localOpMetadata: unknown,
+	): void {
+		this.throwIfDisposed();
+		if (
+			!(
+				this.isMessageForCurrentInstanceOfSubDirectory(msg) &&
+				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);
+	}
+
+	/**
+	 * Apply set operation locally and generate metadata
+	 * @param op - Op to apply
+	 * @returns metadata generated for stahed op
+	 */
+	public applyStashedSetMessage(
+		op: IDirectorySetOperation,
+		context: ILocalValue,
+	): IKeyEditLocalOpMetadata {
+		this.throwIfDisposed();
+		// Set the value locally.
+		const previousValue = this.setCore(op.key, context, true);
+
+		// Create metadata
+		const pendingMessageId = this.getKeyMessageId(op);
+		const localMetadata: IKeyEditLocalOpMetadata = {
+			type: "edit",
+			pendingMessageId,
+			previousValue,
+		};
+		return localMetadata;
+	}
+	/**
+	 * Process a create subdirectory operation.
+	 * @param msg - The message from the server to apply.
+	 * @param op - The op to process
+	 * @param local - Whether the message originated from the local client
+	 * @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.
+	 * @internal
+	 */
+	public processCreateSubDirectoryMessage(
+		msg: ISequencedDocumentMessage,
+		op: IDirectoryCreateSubDirectoryOperation,
+		local: boolean,
+		localOpMetadata: unknown,
+	): void {
+		this.throwIfDisposed();
+		if (!this.needProcessSubDirectoryOperation(msg, op, local, localOpMetadata)) {
+			return;
+		}
+		this.createSubDirectoryCore(op.subdirName, local, msg.sequenceNumber, msg.clientId);
+	}
+
+	/**
+	 * Apply createSubDirectory operation locally and generate metadata
+	 * @param op - Op to apply
+	 * @returns metadata generated for stahed op
+	 */
+	public applyStashedCreateSubDirMessage(
+		op: IDirectoryCreateSubDirectoryOperation,
+	): ICreateSubDirLocalOpMetadata {
+		this.throwIfDisposed();
+		// Create the sub directory locally first.
+		this.createSubDirectoryCore(op.subdirName, true, -1, this.runtime.clientId ?? "detached");
+		const newMessageId = this.getSubDirMessageId(op);
+
+		const localOpMetadata: ICreateSubDirLocalOpMetadata = {
+			type: "createSubDir",
+			pendingMessageId: newMessageId,
+		};
+		return localOpMetadata;
+	}
+
+	/**
+	 * Process a delete subdirectory operation.
+	 * @param msg - The message from the server to apply.
+	 * @param op - The op to process
+	 * @param local - Whether the message originated from the local client
+	 * @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.
+	 * @internal
+	 */
+	public processDeleteSubDirectoryMessage(
+		msg: ISequencedDocumentMessage,
+		op: IDirectoryDeleteSubDirectoryOperation,
+		local: boolean,
+		localOpMetadata: unknown,
+	): void {
+		this.throwIfDisposed();
+		if (
+			!(
+				this.isMessageForCurrentInstanceOfSubDirectory(msg) &&
+				this.needProcessSubDirectoryOperation(msg, op, local, localOpMetadata)
+			)
+		) {
+			return;
+		}
+		this.deleteSubDirectoryCore(op.subdirName, local);
+	}
+
+	/**
+	 * Apply deleteSubDirectory operation locally and generate metadata
+	 * @param op - Op to apply
+	 * @returns metadata generated for stahed op
+	 */
+	public applyStashedDeleteSubDirMessage(
+		op: IDirectoryDeleteSubDirectoryOperation,
+	): IDeleteSubDirLocalOpMetadata {
+		this.throwIfDisposed();
+		const subDir = this.deleteSubDirectoryCore(op.subdirName, true);
+		const newMessageId = this.getSubDirMessageId(op);
+		const metadata: IDeleteSubDirLocalOpMetadata = {
+			type: "deleteSubDir",
+			pendingMessageId: newMessageId,
+			subDirectory: subDir,
+		};
+		return metadata;
+	}
+
+	/**
+	 * Submit a clear operation.
+	 * @param op - The operation
+	 */
+	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),
+			0x32b /* 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,
+			0x32c /* 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;
+		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 resubmitKeyMessage(op: IDirectoryKeyOperation, localOpMetadata: unknown): void {
+		assert(
+			isKeyEditLocalOpMetadata(localOpMetadata),
+			0x32d /* Invalid localOpMetadata in submit */,
+		);
+
+		// clear the old pending message id
+		const pendingMessageIds = this.pendingKeys.get(op.key);
+		assert(
+			pendingMessageIds !== undefined &&
+				pendingMessageIds[0] === localOpMetadata.pendingMessageId,
+			0x32e /* 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]);
+		}
+		if (op.type === "deleteSubDirectory") {
+			const count = this.pendingDeleteSubDirectoriesCount.get(op.subdirName) ?? 0;
+			this.pendingDeleteSubDirectoriesCount.set(op.subdirName, count + 1);
+		}
+		return newMessageId;
+	}
+
+	/**
+	 * Submit a create subdirectory operation.
+	 * @param op - The operation
+	 */
+	private submitCreateSubDirectoryMessage(op: IDirectorySubDirectoryOperation): void {
+		this.throwIfDisposed();
+		const newMessageId = this.getSubDirMessageId(op);
+
+		const localOpMetadata: ICreateSubDirLocalOpMetadata = {
+			type: "createSubDir",
+			pendingMessageId: newMessageId,
+		};
+		this.directory.submitDirectoryMessage(op, localOpMetadata);
+	}
+
+	/**
+	 * Submit a delete subdirectory operation.
+	 * @param op - The operation
+	 * @param subDir - Any subdirectory deleted by the op
+	 */
+	private submitDeleteSubDirectoryMessage(
+		op: IDirectorySubDirectoryOperation,
+		subDir: SubDirectory | undefined,
+	): void {
+		this.throwIfDisposed();
+		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),
+			0x32f /* 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,
+			0x330 /* Unexpected pending message received */,
+		);
+		pendingMessageIds.shift();
+		if (pendingMessageIds.length === 0) {
+			this.pendingSubDirectories.delete(op.subdirName);
+		}
+
+		if (localOpMetadata.type === "createSubDir") {
+			this.submitCreateSubDirectoryMessage(op);
+		} else {
+			this.submitDeleteSubDirectoryMessage(op, localOpMetadata.subDirectory);
+		}
+	}
+
+	/**
+	 * Get the storage of this subdirectory in a serializable format, to be used in snapshotting.
+	 * @param serializer - The serializer to use to serialize handles in its values.
+	 * @returns The JSONable string representing the storage of this subdirectory
+	 * @internal
+	 */
+	public *getSerializedStorage(
+		serializer: IFluidSerializer,
+	): Generator<[string, ISerializedValue], void> {
+		this.throwIfDisposed();
+		for (const [key, localValue] of this._storage) {
+			const value = localValue.makeSerialized(serializer, this.directory.handle);
+			const res: [string, ISerializedValue] = [key, value];
+			yield res;
+		}
+	}
+
+	public getSerializableCreateInfo() {
+		this.throwIfDisposed();
+		const createInfo: ICreateInfo = {
+			csn: this.sequenceNumber,
+			ccIds: Array.from(this.clientIds),
+		};
+		return createInfo;
+	}
+
+	/**
+	 * Populate a key value in this subdirectory's storage, to be used when loading from snapshot.
+	 * @param key - The key to populate
+	 * @param localValue - The local value to populate into it
+	 * @internal
+	 */
+	public populateStorage(key: string, localValue: ILocalValue): void {
+		this.throwIfDisposed();
+		this._storage.set(key, localValue);
+	}
+
+	/**
+	 * Populate a subdirectory into this subdirectory, to be used when loading from snapshot.
+	 * @param subdirName - The name of the subdirectory to add
+	 * @param newSubDir - The new subdirectory to add
+	 * @internal
+	 */
+	public populateSubDirectory(subdirName: string, newSubDir: SubDirectory): void {
+		this.throwIfDisposed();
+		this._subdirectories.set(subdirName, newSubDir);
+	}
+
+	/**
+	 * Retrieve the local value at the given key.  This is used to get value type information stashed on the local
+	 * value so op handlers can be retrieved
+	 * @param key - The key to retrieve from
+	 * @returns The local value
+	 * @internal
+	 */
+	public getLocalValue<T extends ILocalValue = ILocalValue>(key: string): T {
+		this.throwIfDisposed();
+		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,
+	): void {
+		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);
+		}
+	}
+
+	/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+
+	/**
+	 * Rollback a local op
+	 * @param op - The operation to rollback
+	 * @param localOpMetadata - The local metadata associated with the op.
+	 */
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	public rollback(op: any, localOpMetadata: unknown): void {
+		if (!isDirectoryLocalOpMetadata(localOpMetadata)) {
+			throw new Error("Invalid localOpMetadata");
+		}
+
+		if (op.type === "clear" && localOpMetadata.type === "clear") {
+			for (const [key, localValue] of localOpMetadata.previousStorage.entries()) {
+				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 as string, true);
+			} else {
+				this.setCore(op.key as string, localOpMetadata.previousValue, true);
+			}
+
+			this.rollbackPendingMessageId(
+				this.pendingKeys,
+				op.key as string,
+				localOpMetadata.pendingMessageId,
+			);
+		} else if (op.type === "createSubDirectory" && localOpMetadata.type === "createSubDir") {
+			this.deleteSubDirectoryCore(op.subdirName as string, true);
+
+			this.rollbackPendingMessageId(
+				this.pendingSubDirectories,
+				op.subdirName as string,
+				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 as string, localOpMetadata.subDirectory);
+				this.emit("subDirectoryCreated", op.subdirName, true, this);
+			}
+
+			this.rollbackPendingMessageId(
+				this.pendingSubDirectories,
+				op.subdirName as string,
+				localOpMetadata.pendingMessageId,
+			);
+			const count = this.pendingDeleteSubDirectoriesCount.get(op.subdirName);
+			assert(count !== undefined && count > 0, 0x5ab /* should have record for delete op */);
+			this.pendingDeleteSubDirectoriesCount.set(op.subdirName, count - 1);
+			if (count === 1) {
+				this.pendingDeleteSubDirectoriesCount.delete(op.subdirName);
+			}
+		} else {
+			throw new Error("Unsupported op for rollback");
+		}
+	}
+
+	/* eslint-enable @typescript-eslint/no-unsafe-member-access */
+
+	/**
+	 * Converts the given relative path into an absolute path.
+	 * @param path - Relative path to convert
+	 * @returns The equivalent absolute path
+	 */
+	private makeAbsolute(relativePath: string): string {
+		return posix.resolve(this.absolutePath, relativePath);
+	}
+
+	/**
+	 * 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 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(
+		op: IDirectoryKeyOperation,
+		local: boolean,
+		localOpMetadata: unknown,
+	): boolean {
+		if (this.pendingClearMessageIds.length > 0) {
+			if (local) {
+				assert(
+					localOpMetadata !== undefined &&
+						isKeyEditLocalOpMetadata(localOpMetadata) &&
+						localOpMetadata.pendingMessageId < this.pendingClearMessageIds[0],
+					0x010 /* "Received out of order storage op when there is an unackd clear message" */,
+				);
+				// Remove all pendingMessageIds lower than first pendingClearMessageId.
+				const lowestPendingClearMessageId = this.pendingClearMessageIds[0];
+				const pendingKeyMessageIdArray = this.pendingKeys.get(op.key);
+				if (pendingKeyMessageIdArray !== undefined) {
+					let index = 0;
+					while (pendingKeyMessageIdArray[index] < lowestPendingClearMessageId) {
+						index += 1;
+					}
+					const newPendingKeyMessageId = pendingKeyMessageIdArray.splice(index);
+					if (newPendingKeyMessageId.length === 0) {
+						this.pendingKeys.delete(op.key);
+					} else {
+						this.pendingKeys.set(op.key, newPendingKeyMessageId);
+					}
+				}
+			}
+
+			// If I have a NACK clear, we can ignore all ops.
+			return false;
+		}
+
+		const pendingKeyMessageId = this.pendingKeys.get(op.key);
+		if (pendingKeyMessageId !== 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) {
+				assert(
+					localOpMetadata !== undefined && isKeyEditLocalOpMetadata(localOpMetadata),
+					0x011 /* pendingMessageId is missing from the local client's operation */,
+				);
+				const pendingMessageIds = this.pendingKeys.get(op.key);
+				assert(
+					pendingMessageIds !== undefined &&
+						pendingMessageIds[0] === localOpMetadata.pendingMessageId,
+					0x331 /* Unexpected pending message received */,
+				);
+				pendingMessageIds.shift();
+				if (pendingMessageIds.length === 0) {
+					this.pendingKeys.delete(op.key);
+				}
+			}
+			return false;
+		}
+
+		// If we don't have a NACK op on the key, we need to process the remote ops.
+		return !local;
+	}
+
+	/**
+	 * This return true if the message is for the current instance of this sub directory. As the sub directory
+	 * can be deleted and created again, then this finds if the message is for current instance of directory or not.
+	 * @param msg - message for the directory
+	 */
+	private isMessageForCurrentInstanceOfSubDirectory(msg: ISequencedDocumentMessage) {
+		// If the message is either from the creator of directory or this directory was created when
+		// container was detached or in case this directory is already live(known to other clients)
+		// and the op was created after the directory was created then apply this op.
+		return (
+			this.clientIds.has(msg.clientId) ||
+			this.clientIds.has("detached") ||
+			(this.sequenceNumber !== -1 && this.sequenceNumber <= msg.referenceSequenceNumber)
+		);
+	}
+
+	/**
+	 * 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.
+	 * @returns True if the operation should be processed, false otherwise
+	 */
+	private needProcessSubDirectoryOperation(
+		msg: ISequencedDocumentMessage,
+		op: IDirectorySubDirectoryOperation,
+		local: boolean,
+		localOpMetadata: unknown,
+	): boolean {
+		const pendingSubDirectoryMessageId = this.pendingSubDirectories.get(op.subdirName);
+		if (pendingSubDirectoryMessageId !== undefined) {
+			if (local) {
+				assert(
+					isSubDirLocalOpMetadata(localOpMetadata),
+					0x012 /* pendingMessageId is missing from the local client's operation */,
+				);
+				const pendingMessageIds = this.pendingSubDirectories.get(op.subdirName);
+				assert(
+					pendingMessageIds !== undefined &&
+						pendingMessageIds[0] === localOpMetadata.pendingMessageId,
+					0x332 /* Unexpected pending message received */,
+				);
+				pendingMessageIds.shift();
+				if (pendingMessageIds.length === 0) {
+					this.pendingSubDirectories.delete(op.subdirName);
+				}
+				if (op.type === "deleteSubDirectory") {
+					const count = this.pendingDeleteSubDirectoriesCount.get(op.subdirName);
+					assert(
+						count !== undefined && count > 0,
+						0x5ac /* should have record for delete op */,
+					);
+					this.pendingDeleteSubDirectoriesCount.set(op.subdirName, count - 1);
+					if (count === 1) {
+						this.pendingDeleteSubDirectoriesCount.delete(op.subdirName);
+					}
+				}
+			} else if (op.type === "deleteSubDirectory") {
+				// If this is remote delete op and we have keys in this subDirectory, then we need to delete these
+				// keys except the pending ones as they will be sequenced after this delete.
+				const subDirectory = this._subdirectories.get(op.subdirName);
+				if (subDirectory) {
+					subDirectory.clearExceptPendingKeys(local);
+					// In case of remote delete op, we need to reset the creation seq number and client ids of
+					// creators as the previous directory is getting deleted and we will initialize again when
+					// we will receive op for the create again.
+					subDirectory.sequenceNumber = -1;
+					subDirectory.clientIds.clear();
+				}
+			}
+			if (op.type === "createSubDirectory") {
+				const dir = this._subdirectories.get(op.subdirName);
+				if (dir?.sequenceNumber === -1) {
+					// Only set the seq on the first message, could be more
+					dir.sequenceNumber = msg.sequenceNumber;
+				}
+				// The client created the dir at or after the dirs seq, so list its client id as a creator.
+				if (
+					dir !== undefined &&
+					!dir.clientIds.has(msg.clientId) &&
+					dir.sequenceNumber <= msg.sequenceNumber
+				) {
+					dir.clientIds.add(msg.clientId);
+				}
+			}
+			return false;
+		}
+
+		return !local;
+	}
+
+	/**
+	 * Clear all keys in memory in response to a remote clear, but retain keys we have modified but not yet been ack'd.
+	 */
+	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>();
+
+		for (const [key] of this.pendingKeys) {
+			const value = this._storage.get(key);
+			// If this key is already deleted, then we don't need to add it again.
+			if (value !== undefined) {
+				temp.set(key, value);
+			}
+		}
+
+		this.clearCore(local);
+
+		for (const [key, value] of temp.entries()) {
+			this.setCore(key, value, true);
+		}
+	}
+
+	/**
+	 * Clear implementation used for both locally sourced clears as well as incoming remote clears.
+	 * @param local - Whether the message originated from the local client
+	 */
+	private clearCore(local: boolean): void {
+		this._storage.clear();
+		this.directory.emit("clear", local, this.directory);
+	}
+
+	/**
+	 * 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
+	 * @returns Previous local value of the key if it existed, undefined if it did not exist
+	 */
+	private deleteCore(key: string, local: boolean): ILocalValue | undefined {
+		const previousLocalValue = this._storage.get(key);
+		const previousValue: unknown = previousLocalValue?.value;
+		const successfullyRemoved = this._storage.delete(key);
+		if (successfullyRemoved) {
+			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;
+	}
+
+	/**
+	 * Set implementation used for both locally sourced sets as well as incoming remote sets.
+	 * @param key - The key being set
+	 * @param value - The value being set
+	 * @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 {
+		const previousLocalValue = this._storage.get(key);
+		const previousValue: unknown = 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
+	 * @param seq - Sequence number at which this directory is created
+	 * @param clientId - Id of client which created this directory.
+	 * @returns - True if is newly created, false if it already existed.
+	 */
+	private createSubDirectoryCore(
+		subdirName: string,
+		local: boolean,
+		seq: number,
+		clientId: string,
+	): boolean {
+		const subdir = this._subdirectories.get(subdirName);
+		if (subdir === undefined) {
+			const absolutePath = posix.join(this.absolutePath, subdirName);
+			const subDir = new SubDirectory(
+				seq,
+				new Set([clientId]),
+				this.directory,
+				this.runtime,
+				this.serializer,
+				absolutePath,
+			);
+			this.registerEventsOnSubDirectory(subDir, subdirName);
+			this._subdirectories.set(subdirName, subDir);
+			this.emit("subDirectoryCreated", subdirName, local, this);
+			return true;
+		} else {
+			subdir.clientIds.add(clientId);
+		}
+		return false;
+	}
+
+	private registerEventsOnSubDirectory(subDirectory: SubDirectory, subDirName: string): void {
+		subDirectory.on("subDirectoryCreated", (relativePath: string, local: boolean) => {
+			this.emit("subDirectoryCreated", posix.join(subDirName, relativePath), local, this);
+		});
+		subDirectory.on("subDirectoryDeleted", (relativePath: string, local: boolean) => {
+			this.emit("subDirectoryDeleted", posix.join(subDirName, relativePath), local, this);
+		});
+	}
+
+	/**
+	 * 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
+	 */
+	private deleteSubDirectoryCore(subdirName: string, local: boolean): SubDirectory | undefined {
+		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? But not when rollback.
+		if (previousValue !== undefined) {
+			this._subdirectories.delete(subdirName);
+			this.disposeSubDirectoryTree(previousValue);
+			this.emit("subDirectoryDeleted", subdirName, local, this);
+		}
+		return previousValue;
+	}
+
+	private disposeSubDirectoryTree(directory: IDirectory | undefined): void {
+		if (!directory) {
+			return;
+		}
+		// Dispose the subdirectory tree. This will dispose the subdirectories from bottom to top.
+		const subDirectories = directory.subdirectories();
+		for (const [_, subDirectory] of subDirectories) {
+			this.disposeSubDirectoryTree(subDirectory);
+		}
+		if (typeof directory.dispose === "function") {
+			directory.dispose();
+		}
+	}
+
+	private undeleteSubDirectoryTree(directory: SubDirectory): void {
+		// 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();
+	}
 }