@fluidframework/map 2.53.0 → 2.60.0

package/dist/directory.js

@@ -13,10 +13,9 @@ const client_utils_1 = require("@fluid-internal/client-utils");
 const internal_1 = require("@fluidframework/core-utils/internal");
 const internal_2 = require("@fluidframework/driver-definitions/internal");
 const internal_3 = require("@fluidframework/driver-utils/internal");
-const internal_4 = require("@fluidframework/merge-tree/internal");
-const internal_5 = require("@fluidframework/runtime-utils/internal");
-const internal_6 = require("@fluidframework/shared-object-base/internal");
-const internal_7 = require("@fluidframework/telemetry-utils/internal");
+const internal_4 = require("@fluidframework/runtime-utils/internal");
+const internal_5 = require("@fluidframework/shared-object-base/internal");
+const internal_6 = require("@fluidframework/telemetry-utils/internal");
 const path_browserify_1 = __importDefault(require("path-browserify"));
 const localValues_js_1 = require("./localValues.js");
 const utils_js_1 = require("./utils.js");
@@ -67,60 +66,6 @@ const seqDataComparator = (a, b) => {
 function isAcknowledgedOrDetached(seqData) {
     return seqData.seq >= 0;
 }
-/**
- * A utility class for tracking associations between keys and their creation indices.
- * This is relevant to support map iteration in insertion order, see
- * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Iterator/%40%40iterator
- *
- * TODO: It can be combined with the creation tracker utilized in SharedMap
- */
-class DirectoryCreationTracker {
-    constructor() {
-        this.indexToKey = new internal_4.RedBlackTree(seqDataComparator);
-        this.keyToIndex = new Map();
-    }
-    set(key, seqData) {
-        this.indexToKey.put(seqData, key);
-        this.keyToIndex.set(key, seqData);
-    }
-    has(keyOrSeqData) {
-        return typeof keyOrSeqData === "string"
-            ? this.keyToIndex.has(keyOrSeqData)
-            : this.indexToKey.get(keyOrSeqData) !== undefined;
-    }
-    delete(keyOrSeqData) {
-        if (this.has(keyOrSeqData)) {
-            if (typeof keyOrSeqData === "string") {
-                const seqData = this.keyToIndex.get(keyOrSeqData);
-                this.keyToIndex.delete(keyOrSeqData);
-                this.indexToKey.remove(seqData);
-            }
-            else {
-                const key = this.indexToKey.get(keyOrSeqData)?.data;
-                this.indexToKey.remove(keyOrSeqData);
-                this.keyToIndex.delete(key);
-            }
-        }
-    }
-    /**
-     * Retrieves all subdirectories with creation order that satisfy an optional constraint function.
-     * @param constraint - An optional constraint function that filters keys.
-     * @returns An array of keys that satisfy the constraint (or all keys if no constraint is provided).
-     */
-    keys(constraint) {
-        const keys = [];
-        this.indexToKey.mapRange((node) => {
-            if (!constraint || constraint(node.data)) {
-                keys.push(node.data);
-            }
-            return true;
-        }, keys);
-        return keys;
-    }
-    get size() {
-        return this.keyToIndex.size;
-    }
-}
 /**
  * {@inheritDoc ISharedDirectory}
  *
@@ -134,7 +79,7 @@ class DirectoryCreationTracker {
  *
  * @sealed
  */
-class SharedDirectory extends internal_6.SharedObject {
+class SharedDirectory extends internal_5.SharedObject {
     /**
      * {@inheritDoc IDirectory.absolutePath}
      */
@@ -321,6 +266,25 @@ class SharedDirectory extends internal_6.SharedObject {
         }
         return currentSubDir;
     }
+    /**
+     * Similar to `getWorkingDirectory`, but only returns directories that are sequenced.
+     * This can be useful for op processing since we only process ops on sequenced directories.
+     */
+    getSequencedWorkingDirectory(relativePath) {
+        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.sequencedSubdirectories.get(subdir);
+            if (!currentSubDir) {
+                return undefined;
+            }
+        }
+        return currentSubDir;
+    }
     /**
      * {@inheritDoc @fluidframework/shared-object-base#SharedObject.summarizeCore}
      */
@@ -413,17 +377,13 @@ class SharedDirectory extends internal_6.SharedObject {
                         }
                         newSubDir = new SubDirectory(seqData, createInfo === undefined ? new Set() : new Set(createInfo.ccIds), this, this.runtime, this.serializer, posix.join(currentSubDir.absolutePath, subdirName), this.logger);
                         currentSubDir.populateSubDirectory(subdirName, newSubDir);
-                        // Record the newly inserted subdirectory to the creation tracker
-                        currentSubDir.ackedCreationSeqTracker.set(subdirName, {
-                            ...seqData,
-                        });
                     }
                     stack.push([newSubDir, subdirObject]);
                 }
             }
             if (currentSubDirObject.storage) {
                 for (const [key, serializable] of Object.entries(currentSubDirObject.storage)) {
-                    const parsedSerializable = (0, internal_6.parseHandles)(serializable, this.serializer);
+                    const parsedSerializable = (0, internal_5.parseHandles)(serializable, this.serializer);
                     (0, localValues_js_1.migrateIfSharedSerializable)(parsedSerializable, this.serializer, this.handle);
                     currentSubDir.populateStorage(key, parsedSerializable.value);
                 }
@@ -459,114 +419,87 @@ class SharedDirectory extends internal_6.SharedObject {
     makeAbsolute(relativePath) {
         return posix.resolve(posix.sep, relativePath);
     }
-    /**
-     * This checks if there is pending delete op for local delete for a any subdir in the relative path.
-     * @param relativePath - path of sub directory.
-     * @returns `true` if there is pending delete, `false` otherwise.
-     */
-    isSubDirectoryDeletePending(relativePath) {
-        const absolutePath = this.makeAbsolute(relativePath);
-        if (absolutePath === posix.sep) {
-            return false;
-        }
-        let currentParent = this.root;
-        const pathParts = absolutePath.split(posix.sep).slice(1);
-        for (const dirName of pathParts) {
-            if (currentParent.isSubDirectoryDeletePending(dirName)) {
-                return true;
-            }
-            currentParent = currentParent.getSubDirectory(dirName);
-            if (currentParent === undefined) {
-                return true;
-            }
-        }
-        return false;
-    }
     /**
      * Set the message handlers for the directory.
      */
     setMessageHandlers() {
+        // Notes on how we target the correct subdirectory:
+        // `process`: When processing ops, we only ever want to process ops on sequenced directories. This prevents
+        // scenarios where ops could be processed on a pending directory instead of a sequenced directory,
+        // leading to ops effectively being processed out of order.
+        // `resubmit`: When resubmitting ops, we use `localOpMetadata` to get a reference to the subdirectory that
+        // the op was originally targeting.
         this.messageHandlers.set("clear", {
             process: (msg, op, local, localOpMetadata) => {
-                const subdir = this.getWorkingDirectory(op.path);
-                // If there is pending delete op for any subDirectory in the op.path, then don't apply the this op
-                // as we are going to delete this subDirectory.
-                if (subdir && !this.isSubDirectoryDeletePending(op.path)) {
+                const subdir = this.getSequencedWorkingDirectory(op.path);
+                if (subdir !== undefined && !subdir?.disposed) {
                     subdir.processClearMessage(msg, op, local, localOpMetadata);
                 }
             },
             resubmit: (op, localOpMetadata) => {
-                const subdir = this.getWorkingDirectory(op.path);
-                if (subdir) {
-                    subdir.resubmitClearMessage(op, localOpMetadata);
+                const targetSubdir = localOpMetadata.subdir;
+                if (!targetSubdir.disposed) {
+                    targetSubdir.resubmitClearMessage(op, localOpMetadata);
                 }
             },
         });
         this.messageHandlers.set("delete", {
             process: (msg, op, local, localOpMetadata) => {
-                const subdir = this.getWorkingDirectory(op.path);
-                // If there is pending delete op for any subDirectory in the op.path, then don't apply the this op
-                // as we are going to delete this subDirectory.
-                if (subdir && !this.isSubDirectoryDeletePending(op.path)) {
+                const subdir = this.getSequencedWorkingDirectory(op.path);
+                if (subdir !== undefined && !subdir?.disposed) {
                     subdir.processDeleteMessage(msg, op, local, localOpMetadata);
                 }
             },
             resubmit: (op, localOpMetadata) => {
-                const subdir = this.getWorkingDirectory(op.path);
-                if (subdir) {
-                    subdir.resubmitKeyMessage(op, localOpMetadata);
+                const targetSubdir = localOpMetadata.subdir;
+                if (!targetSubdir.disposed) {
+                    targetSubdir.resubmitKeyMessage(op, localOpMetadata);
                 }
             },
         });
         this.messageHandlers.set("set", {
             process: (msg, op, local, localOpMetadata) => {
-                const subdir = this.getWorkingDirectory(op.path);
-                // If there is pending delete op for any subDirectory in the op.path, then don't apply the this op
-                // as we are going to delete this subDirectory.
-                if (subdir && !this.isSubDirectoryDeletePending(op.path)) {
+                const subdir = this.getSequencedWorkingDirectory(op.path);
+                if (subdir !== undefined && !subdir?.disposed) {
                     (0, localValues_js_1.migrateIfSharedSerializable)(op.value, this.serializer, this.handle);
                     const localValue = local ? undefined : op.value.value;
                     subdir.processSetMessage(msg, op, localValue, local, localOpMetadata);
                 }
             },
             resubmit: (op, localOpMetadata) => {
-                const subdir = this.getWorkingDirectory(op.path);
-                if (subdir) {
-                    subdir.resubmitKeyMessage(op, localOpMetadata);
+                const targetSubdir = localOpMetadata.subdir;
+                if (!targetSubdir.disposed) {
+                    targetSubdir.resubmitKeyMessage(op, localOpMetadata);
                 }
             },
         });
         this.messageHandlers.set("createSubDirectory", {
             process: (msg, op, local, localOpMetadata) => {
-                const parentSubdir = this.getWorkingDirectory(op.path);
-                // If there is pending delete op for any subDirectory in the op.path, then don't apply the this op
-                // as we are going to delete this subDirectory.
-                if (parentSubdir && !this.isSubDirectoryDeletePending(op.path)) {
+                const parentSubdir = this.getSequencedWorkingDirectory(op.path);
+                if (parentSubdir !== undefined && !parentSubdir?.disposed) {
                     parentSubdir.processCreateSubDirectoryMessage(msg, op, local, localOpMetadata);
                 }
             },
             resubmit: (op, localOpMetadata) => {
-                const parentSubdir = this.getWorkingDirectory(op.path);
-                if (parentSubdir) {
+                const targetSubdir = localOpMetadata.parentSubdir;
+                if (!targetSubdir.disposed) {
                     // We don't reuse the metadata but send a new one on each submit.
-                    parentSubdir.resubmitSubDirectoryMessage(op, localOpMetadata);
+                    targetSubdir.resubmitSubDirectoryMessage(op, localOpMetadata);
                 }
             },
         });
         this.messageHandlers.set("deleteSubDirectory", {
             process: (msg, op, local, localOpMetadata) => {
-                const parentSubdir = this.getWorkingDirectory(op.path);
-                // If there is pending delete op for any subDirectory in the op.path, then don't apply the this op
-                // as we are going to delete this subDirectory.
-                if (parentSubdir && !this.isSubDirectoryDeletePending(op.path)) {
+                const parentSubdir = this.getSequencedWorkingDirectory(op.path);
+                if (parentSubdir !== undefined && !parentSubdir?.disposed) {
                     parentSubdir.processDeleteSubDirectoryMessage(msg, op, local, localOpMetadata);
                 }
             },
             resubmit: (op, localOpMetadata) => {
-                const parentSubdir = this.getWorkingDirectory(op.path);
-                if (parentSubdir) {
+                const targetSubdir = localOpMetadata.parentSubdir;
+                if (!targetSubdir.disposed) {
                     // We don't reuse the metadata but send a new one on each submit.
-                    parentSubdir.resubmitSubDirectoryMessage(op, localOpMetadata);
+                    targetSubdir.resubmitSubDirectoryMessage(op, localOpMetadata);
                 }
             },
         });
@@ -606,7 +539,7 @@ class SharedDirectory extends internal_6.SharedObject {
     }
     serializeDirectory(root, serializer, telemetryContext) {
         const MinValueSizeSeparateSnapshotBlob = 8 * 1024;
-        const builder = new internal_5.SummaryTreeBuilder();
+        const builder = new internal_4.SummaryTreeBuilder();
         let counter = 0;
         const blobs = [];
         const stack = [];
@@ -667,7 +600,6 @@ exports.SharedDirectory = SharedDirectory;
 function assertNonNullClientId(clientId) {
     (0, internal_1.assert)(clientId !== null, 0x6af /* client id should never be null */);
 }
-let hasLoggedDirectoryInconsistency = false;
 /**
  * Node of the directory tree.
  * @sealed
@@ -690,7 +622,6 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
         this.runtime = runtime;
         this.serializer = serializer;
         this.absolutePath = absolutePath;
-        this.logger = logger;
         /**
          * Tells if the sub directory is deleted or not.
          */
@@ -700,21 +631,10 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
          */
         this[_b] = "SubDirectory";
         /**
-         * The subdirectories the directory is holding.
+         * The sequenced subdirectories the directory is holding independent of any pending
+         * create/delete subdirectory operations.
          */
-        this._subdirectories = new Map();
-        /**
-         * Subdirectories that have been deleted locally but not yet ack'd from the server. This maintains the record
-         * of delete op that are pending or yet to be acked from server. This is maintained just to track the locally
-         * deleted sub directory.
-         */
-        this.pendingDeleteSubDirectoriesTracker = new Map();
-        /**
-         * Subdirectories that have been created locally but not yet ack'd from the server. This maintains the record
-         * of create op that are pending or yet to be acked from server. This is maintained just to track the locally
-         * created sub directory.
-         */
-        this.pendingCreateSubDirectoriesTracker = new Map();
+        this._sequencedSubdirectories = new Map();
         /**
          * Assigns a unique ID to each subdirectory created locally but pending for acknowledgement, facilitating the tracking
          * of the creation order.
@@ -733,6 +653,11 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
          * even across remote operations and rollbacks.
          */
         this.pendingStorageData = [];
+        /**
+         * A data structure containing all local pending subdirectory create/deletes, which is used in combination
+         * with the _sequencedSubdirectories to compute optimistic values.
+         */
+        this.pendingSubDirectoryData = [];
         /**
          * An internal iterator that iterates over the entries in the directory.
          */
@@ -821,8 +746,33 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
                 ? this.sequencedStorageData.has(key)
                 : latestPendingEntry.type === "lifetime";
         };
-        this.localCreationSeqTracker = new DirectoryCreationTracker();
-        this.ackedCreationSeqTracker = new DirectoryCreationTracker();
+        /**
+         * Get the optimistic local subdirectory. This combines the sequenced data with
+         * any pending changes that have not yet been sequenced. By default, we do not
+         * consider disposed directories as optimistically existing, but if `getIfDisposed`
+         * is true, we will include them since some scenarios require this.
+         */
+        this.getOptimisticSubDirectory = (subdirName, getIfDisposed = false) => {
+            const latestPendingEntry = (0, utils_js_1.findLast)(this.pendingSubDirectoryData, (entry) => entry.subdirName === subdirName);
+            let subdir;
+            if (latestPendingEntry === undefined) {
+                subdir = this._sequencedSubdirectories.get(subdirName);
+            }
+            else if (latestPendingEntry.type === "createSubDirectory") {
+                subdir = latestPendingEntry.subdir;
+                (0, internal_1.assert)(subdir !== undefined, 0xc2f /* Subdirectory should exist in pending data */);
+            }
+            else {
+                // Pending delete
+                return undefined;
+            }
+            // If the subdirectory is disposed, treat it as non-existent for optimistic reads (unless specified otherwise)
+            if (subdir?.disposed && !getIfDisposed) {
+                return undefined;
+            }
+            return subdir;
+        };
+        this.mc = (0, internal_6.createChildMonitoringContext)({ logger, namespace: "Directory" });
     }
     dispose(error) {
         this._deleted = true;
@@ -840,7 +790,7 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
     }
     throwIfDisposed() {
         if (this._deleted) {
-            throw new internal_7.UsageError("Cannot access Disposed subDirectory");
+            throw new internal_6.UsageError("Cannot access Disposed subDirectory");
         }
     }
     /**
@@ -868,8 +818,12 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
             throw new Error("Undefined and null keys are not supported");
         }
         const previousOptimisticLocalValue = this.getOptimisticValue(key);
-        // Create a local value and serialize it.
-        (0, internal_6.bindHandles)(value, this.serializer, this.directory.handle);
+        const detachedBind = this.mc.config.getBoolean("Fluid.Directory.AllowDetachedResolve") ?? false;
+        if (detachedBind) {
+            // Create a local value and serialize it.
+            // AB#47081: This will be removed once we can validate that it is no longer needed.
+            (0, internal_5.bindHandles)(value, this.serializer, this.directory.handle);
+        }
         // If we are not attached, don't submit the op.
         if (!this.directory.isAttached()) {
             this.sequencedStorageData.set(key, value);
@@ -894,20 +848,27 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
         if (latestPendingEntry === undefined ||
             latestPendingEntry.type === "delete" ||
             latestPendingEntry.type === "clear") {
-            latestPendingEntry = { type: "lifetime", path: this.absolutePath, key, keySets: [] };
+            latestPendingEntry = {
+                type: "lifetime",
+                path: this.absolutePath,
+                key,
+                keySets: [],
+                subdir: this,
+            };
             this.pendingStorageData.push(latestPendingEntry);
         }
         const pendingKeySet = {
             type: "set",
             path: this.absolutePath,
             value,
+            subdir: this,
         };
         latestPendingEntry.keySets.push(pendingKeySet);
         const op = {
             key,
             path: this.absolutePath,
             type: "set",
-            value: { type: internal_6.ValueType[internal_6.ValueType.Plain], value },
+            value: { type: internal_5.ValueType[internal_5.ValueType.Plain], value },
         };
         this.submitKeyMessage(op, pendingKeySet);
         const directoryValueChanged = {
@@ -927,7 +888,7 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
      * {@inheritDoc IDirectory.countSubDirectory}
      */
     countSubDirectory() {
-        return this._subdirectories.size;
+        return [...this.subdirectories()].length;
     }
     /**
      * {@inheritDoc IDirectory.createSubDirectory}
@@ -941,22 +902,47 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
         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, this.getLocalSeq(), this.runtime.clientId ?? "detached");
-        const subDir = this._subdirectories.get(subdirName);
-        (0, internal_1.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;
+        let subDir = this.getOptimisticSubDirectory(subdirName, true);
+        const seqData = this.getLocalSeq();
+        const clientId = this.runtime.clientId ?? "detached";
+        const isNewSubDirectory = subDir === undefined;
+        if (subDir === undefined) {
+            // If we do not have optimistically have this subdirectory yet, we should create a new one
+            const absolutePath = posix.join(this.absolutePath, subdirName);
+            subDir = new SubDirectory({ ...seqData }, new Set([clientId]), this.directory, this.runtime, this.serializer, absolutePath, this.mc.logger);
         }
-        // Only submit the op, if it is newly created.
-        if (isNew) {
-            const op = {
-                path: this.absolutePath,
-                subdirName,
-                type: "createSubDirectory",
-            };
-            this.submitCreateSubDirectoryMessage(op);
+        else {
+            if (subDir.disposed) {
+                // In the case that the subdir exists but is disposed, we should
+                // still use the existing subdir to maintain any pending changes but
+                // ensure it is no longer disposed.
+                this.undisposeSubdirectoryTree(subDir);
+            }
+            subDir.clientIds.add(clientId);
+        }
+        this.registerEventsOnSubDirectory(subDir, subdirName);
+        // Only submit the op/emit event if we actually created a new subdir.
+        if (isNewSubDirectory) {
+            if (this.directory.isAttached()) {
+                const pendingSubDirectoryCreate = {
+                    type: "createSubDirectory",
+                    subdirName,
+                    subdir: subDir,
+                };
+                this.pendingSubDirectoryData.push(pendingSubDirectoryCreate);
+                const op = {
+                    subdirName,
+                    path: this.absolutePath,
+                    type: "createSubDirectory",
+                };
+                this.submitCreateSubDirectoryMessage(op);
+            }
+            else {
+                // If we are detached, don't submit the op and directly commit
+                // the subdir to _sequencedSubdirectories.
+                this._sequencedSubdirectories.set(subdirName, subDir);
+            }
+            this.emit("subDirectoryCreated", subdirName, true, this);
         }
         return subDir;
     }
@@ -981,81 +967,88 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
      */
     getSubDirectory(subdirName) {
         this.throwIfDisposed();
-        return this._subdirectories.get(subdirName);
+        return this.getOptimisticSubDirectory(subdirName);
     }
     /**
      * {@inheritDoc IDirectory.hasSubDirectory}
      */
     hasSubDirectory(subdirName) {
         this.throwIfDisposed();
-        return this._subdirectories.has(subdirName);
+        return this.getOptimisticSubDirectory(subdirName) !== undefined;
     }
     /**
      * {@inheritDoc IDirectory.deleteSubDirectory}
      */
     deleteSubDirectory(subdirName) {
         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 previousValue = this._sequencedSubdirectories.get(subdirName);
+            const successfullyRemoved = this._sequencedSubdirectories.delete(subdirName);
+            // Only emit if we actually deleted something.
+            if (successfullyRemoved) {
+                this.disposeSubDirectoryTree(previousValue);
+                this.emit("subDirectoryDeleted", subdirName, true, this);
+            }
+            return successfullyRemoved;
         }
-        // Only submit the op, if the directory existed and we deleted it.
-        if (subDir !== undefined) {
-            const op = {
-                path: this.absolutePath,
-                subdirName,
-                type: "deleteSubDirectory",
-            };
-            this.submitDeleteSubDirectoryMessage(op, subDir);
+        const previousOptimisticSubDirectory = this.getOptimisticSubDirectory(subdirName);
+        if (previousOptimisticSubDirectory === undefined) {
+            return false;
         }
-        return subDir !== undefined;
+        const pendingSubdirDelete = {
+            type: "deleteSubDirectory",
+            subdirName,
+            subdir: this,
+        };
+        this.pendingSubDirectoryData.push(pendingSubdirDelete);
+        const op = {
+            subdirName,
+            type: "deleteSubDirectory",
+            path: this.absolutePath,
+        };
+        this.submitDeleteSubDirectoryMessage(op, previousOptimisticSubDirectory);
+        this.emit("subDirectoryDeleted", subdirName, true, this);
+        // We don't want to fully dispose the subdir tree since this is only a pending
+        // local delete. Instead we will only emit the dispose event to reflect the
+        // local state.
+        this.emitDisposeForSubdirTree(previousOptimisticSubDirectory);
+        return true;
     }
     /**
      * {@inheritDoc IDirectory.subdirectories}
      */
     subdirectories() {
         this.throwIfDisposed();
-        const ackedSubdirsInOrder = this.ackedCreationSeqTracker.keys();
-        const localSubdirsInOrder = this.localCreationSeqTracker.keys((key) => !this.ackedCreationSeqTracker.has(key));
-        const subdirNames = [...ackedSubdirsInOrder, ...localSubdirsInOrder];
-        if (subdirNames.length !== this._subdirectories.size) {
-            // TODO: AB#7022: Hitting this block indicates that the eventual consistency scheme for ordering subdirectories
-            // has failed. Fall back to previous directory behavior, which didn't guarantee ordering.
-            // It's not currently clear how to reach this state, so log some diagnostics to help understand the issue.
-            // This whole block should eventually be replaced by an assert that the two sizes align.
-            if (!hasLoggedDirectoryInconsistency) {
-                this.logger.sendTelemetryEvent({
-                    eventName: "inconsistentSubdirectoryOrdering",
-                    localKeyCount: this.localCreationSeqTracker.size,
-                    ackedKeyCount: this.ackedCreationSeqTracker.size,
-                    subdirNamesLength: subdirNames.length,
-                    subdirectoriesSize: this._subdirectories.size,
-                });
-                hasLoggedDirectoryInconsistency = true;
+        // subdirectories() should reflect the optimistic state of subdirectories.
+        // This means that we should return both sequenced and pending subdirectories
+        // that do not also have a pending deletion.
+        const sequencedSubdirs = [];
+        const sequencedSubdirNames = new Set([...this._sequencedSubdirectories.keys()]);
+        for (const subdirName of sequencedSubdirNames) {
+            const optimisticSubdir = this.getOptimisticSubDirectory(subdirName);
+            if (optimisticSubdir !== undefined) {
+                sequencedSubdirs.push([subdirName, optimisticSubdir]);
             }
-            return this._subdirectories.entries();
-        }
-        const entriesIterator = {
-            index: 0,
-            dirs: this._subdirectories,
-            next() {
-                if (this.index < subdirNames.length) {
-                    // Bounds check above guarantees non-null (at least at compile time, assuming all types are respected)
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                    const subdirName = subdirNames[this.index++];
-                    const subdir = this.dirs.get(subdirName);
-                    (0, internal_1.assert)(subdir !== undefined, 0x8ac /* Could not find expected sub-directory. */);
-                    return { value: [subdirName, subdir], done: false };
-                }
-                return { value: undefined, done: true };
-            },
-            [Symbol.iterator]() {
-                return this;
-            },
-        };
-        return entriesIterator;
+        }
+        const pendingSubdirNames = [
+            ...new Set(this.pendingSubDirectoryData
+                .map((entry) => entry.subdirName)
+                .filter((subdirName) => !sequencedSubdirNames.has(subdirName))),
+        ];
+        const pendingSubdirs = [];
+        for (const subdirName of pendingSubdirNames) {
+            const optimisticSubdir = this.getOptimisticSubDirectory(subdirName);
+            if (optimisticSubdir !== undefined) {
+                pendingSubdirs.push([subdirName, optimisticSubdir]);
+            }
+        }
+        const allSubdirs = [...sequencedSubdirs, ...pendingSubdirs];
+        const orderedSubdirs = allSubdirs.sort((a, b) => {
+            const aSeqData = a[1].seqData;
+            const bSeqData = b[1].seqData;
+            return seqDataComparator(aSeqData, bSeqData);
+        });
+        return orderedSubdirs[Symbol.iterator]();
     }
     /**
      * {@inheritDoc IDirectory.getWorkingDirectory}
@@ -1070,10 +1063,10 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
      * @returns true if there is pending delete.
      */
     isSubDirectoryDeletePending(subDirName) {
-        if (this.pendingDeleteSubDirectoriesTracker.has(subDirName)) {
-            return true;
-        }
-        return false;
+        const lastPendingEntry = (0, utils_js_1.findLast)(this.pendingSubDirectoryData, (entry) => {
+            return entry.subdirName === subDirName && entry.type === "deleteSubDirectory";
+        });
+        return lastPendingEntry !== undefined;
     }
     /**
      * Deletes the given key from within this IDirectory.
@@ -1105,6 +1098,7 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
             type: "delete",
             path: this.absolutePath,
             key,
+            subdir: this,
         };
         this.pendingStorageData.push(pendingKeyDelete);
         const op = {
@@ -1144,6 +1138,7 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
         const pendingClear = {
             type: "clear",
             path: this.absolutePath,
+            subdir: this,
         };
         this.pendingStorageData.push(pendingClear);
         this.directory.emit("clear", true, this.directory);
@@ -1160,7 +1155,7 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
     forEach(callback) {
         this.throwIfDisposed();
         for (const [key, localValue] of this.internalIterator()) {
-            callback(localValue.value, key, this);
+            callback(localValue, key, this);
         }
     }
     /**
@@ -1248,6 +1243,10 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
         this.throwIfDisposed();
         return this.internalIterator();
     }
+    get sequencedSubdirectories() {
+        this.throwIfDisposed();
+        return this._sequencedSubdirectories;
+    }
     /**
      * Process a clear operation.
      * @param msg - The message from the server to apply.
@@ -1258,7 +1257,7 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
      */
     processClearMessage(msg, op, local, localOpMetadata) {
         this.throwIfDisposed();
-        if (!this.isMessageForCurrentInstanceOfSubDirectory(msg)) {
+        if (!this.isMessageForCurrentInstanceOfSubDirectory(msg, localOpMetadata?.subdir)) {
             return;
         }
         if (local) {
@@ -1302,7 +1301,7 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
      */
     processDeleteMessage(msg, op, local, localOpMetadata) {
         this.throwIfDisposed();
-        if (!this.isMessageForCurrentInstanceOfSubDirectory(msg)) {
+        if (!this.isMessageForCurrentInstanceOfSubDirectory(msg, localOpMetadata?.subdir)) {
             return;
         }
         if (local) {
@@ -1340,7 +1339,7 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
      */
     processSetMessage(msg, op, value, local, localOpMetadata) {
         this.throwIfDisposed();
-        if (!this.isMessageForCurrentInstanceOfSubDirectory(msg)) {
+        if (!this.isMessageForCurrentInstanceOfSubDirectory(msg, localOpMetadata?.subdir)) {
             return;
         }
         const { key } = op;
@@ -1378,12 +1377,58 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
      */
     processCreateSubDirectoryMessage(msg, op, local, localOpMetadata) {
         this.throwIfDisposed();
-        if (!(this.isMessageForCurrentInstanceOfSubDirectory(msg) &&
-            this.needProcessSubDirectoryOperation(msg, op, local, localOpMetadata))) {
+        if (!this.isMessageForCurrentInstanceOfSubDirectory(msg, localOpMetadata?.parentSubdir)) {
             return;
         }
         assertNonNullClientId(msg.clientId);
-        this.createSubDirectoryCore(op.subdirName, local, { seq: msg.sequenceNumber, clientSeq: msg.clientSequenceNumber }, msg.clientId);
+        let subDir;
+        if (local) {
+            const pendingEntryIndex = this.pendingSubDirectoryData.findIndex((entry) => entry.subdirName === op.subdirName);
+            const pendingEntry = this.pendingSubDirectoryData[pendingEntryIndex];
+            (0, internal_1.assert)(pendingEntry !== undefined && pendingEntry.type === "createSubDirectory", 0xc30 /* Got a local subdir create message we weren't expecting */);
+            this.pendingSubDirectoryData.splice(pendingEntryIndex, 1);
+            subDir = pendingEntry.subdir;
+            const existingSubdir = this._sequencedSubdirectories.get(op.subdirName);
+            if (existingSubdir !== undefined) {
+                // If the subdirectory already exists, we don't need to create it again.
+                // This can happen if remote clients also create the same subdir and we processed
+                // that message first.
+                return;
+            }
+            if (subDir.disposed) {
+                this.undisposeSubdirectoryTree(subDir);
+            }
+            this._sequencedSubdirectories.set(op.subdirName, subDir);
+        }
+        else {
+            subDir = this.getOptimisticSubDirectory(op.subdirName, true);
+            if (subDir === undefined) {
+                const absolutePath = posix.join(this.absolutePath, op.subdirName);
+                subDir = new SubDirectory({ seq: msg.sequenceNumber, clientSeq: msg.clientSequenceNumber }, new Set([msg.clientId]), this.directory, this.runtime, this.serializer, absolutePath, this.mc.logger);
+            }
+            else {
+                // If the subdirectory already optimistically exists, we don't need to create it again.
+                // This can happen if remote clients also created the same subdir.
+                if (subDir.disposed) {
+                    this.undisposeSubdirectoryTree(subDir);
+                }
+                subDir.clientIds.add(msg.clientId);
+            }
+            this.registerEventsOnSubDirectory(subDir, op.subdirName);
+            this._sequencedSubdirectories.set(op.subdirName, subDir);
+            // Suppress the event if local changes would cause the incoming change to be invisible optimistically.
+            if (!this.pendingSubDirectoryData.some((entry) => entry.subdirName === op.subdirName)) {
+                this.emit("subDirectoryCreated", op.subdirName, local, this);
+            }
+        }
+        // Ensure correct seqData. This can be necessary if in scenarios where a subdir was created, deleted, and
+        // then later recreated.
+        if (this.seqData.seq !== -1 &&
+            this.seqData.seq <= msg.sequenceNumber &&
+            subDir.seqData.seq === -1) {
+            subDir.seqData.seq = msg.sequenceNumber;
+            subDir.seqData.clientSeq = msg.clientSequenceNumber;
+        }
     }
     /**
      * Process a delete subdirectory operation.
@@ -1395,11 +1440,43 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
      */
     processDeleteSubDirectoryMessage(msg, op, local, localOpMetadata) {
         this.throwIfDisposed();
-        if (!(this.isMessageForCurrentInstanceOfSubDirectory(msg) &&
-            this.needProcessSubDirectoryOperation(msg, op, local, localOpMetadata))) {
+        if (!this.isMessageForCurrentInstanceOfSubDirectory(msg, localOpMetadata?.parentSubdir)) {
             return;
         }
-        this.deleteSubDirectoryCore(op.subdirName, local);
+        const previousValue = this._sequencedSubdirectories.get(op.subdirName);
+        if (previousValue === undefined) {
+            // We are trying to delete a subdirectory that does not exist.
+            // If this is a local delete, we should remove the pending delete entry.
+            // This could happen if we already processed a remote delete op for
+            // the same subdirectory.
+            if (local) {
+                const pendingEntryIndex = this.pendingSubDirectoryData.findIndex((entry) => entry.subdirName === op.subdirName);
+                const pendingEntry = this.pendingSubDirectoryData[pendingEntryIndex];
+                (0, internal_1.assert)(pendingEntry !== undefined &&
+                    pendingEntry.type === "deleteSubDirectory" &&
+                    pendingEntry.subdirName === op.subdirName, 0xc31 /* Got a local deleteSubDirectory message we weren't expecting */);
+                this.pendingSubDirectoryData.splice(pendingEntryIndex, 1);
+            }
+            return;
+        }
+        this._sequencedSubdirectories.delete(op.subdirName);
+        this.disposeSubDirectoryTree(previousValue);
+        if (local) {
+            const pendingEntryIndex = this.pendingSubDirectoryData.findIndex((entry) => entry.subdirName === op.subdirName);
+            const pendingEntry = this.pendingSubDirectoryData[pendingEntryIndex];
+            (0, internal_1.assert)(pendingEntry !== undefined &&
+                pendingEntry.type === "deleteSubDirectory" &&
+                pendingEntry.subdirName === op.subdirName, 0xc32 /* Got a local deleteSubDirectory message we weren't expecting */);
+            this.pendingSubDirectoryData.splice(pendingEntryIndex, 1);
+        }
+        else {
+            // Suppress the event if local changes would cause the incoming change to be invisible optimistically.
+            const pendingEntryIndex = this.pendingSubDirectoryData.findIndex((entry) => entry.subdirName === op.subdirName && entry.type === "deleteSubDirectory");
+            const pendingEntry = this.pendingSubDirectoryData[pendingEntryIndex];
+            if (pendingEntry === undefined) {
+                this.emit("subDirectoryDeleted", op.subdirName, local, this);
+            }
+        }
     }
     /**
      * Submit a clear operation.
@@ -1440,44 +1517,28 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
     resubmitKeyMessage(op, localOpMetadata) {
         // Only submit the op, if we have record for it, otherwise it is possible that the older instance
         // is already deleted, in which case we don't need to submit the op.
-        const pendingEntryIndex = this.pendingStorageData.findIndex((entry) => entry.type !== "clear" && entry.key === op.key);
+        const pendingEntryIndex = this.pendingStorageData.findIndex((entry) => {
+            return op.type === "set"
+                ? entry.type === "lifetime" &&
+                    entry.key === op.key &&
+                    // We also check that the keySets include the localOpMetadata. It's possible we have new
+                    // pending key sets that are not the op we are looking for.
+                    entry.keySets.includes(localOpMetadata)
+                : entry.type === "delete" && entry.key === op.key;
+        });
         const pendingEntry = this.pendingStorageData[pendingEntryIndex];
         if (pendingEntry !== undefined) {
             this.submitKeyMessage(op, localOpMetadata);
         }
     }
-    incrementPendingSubDirCount(map, subDirName) {
-        const count = map.get(subDirName) ?? 0;
-        map.set(subDirName, count + 1);
-    }
-    decrementPendingSubDirCount(map, subDirName) {
-        const count = map.get(subDirName) ?? 0;
-        map.set(subDirName, count - 1);
-        if (count <= 1) {
-            map.delete(subDirName);
-        }
-    }
-    /**
-     * Update the count for pending create/delete of the sub directory so that it can be validated on receiving op
-     * or while resubmitting the op.
-     */
-    updatePendingSubDirMessageCount(op) {
-        if (op.type === "deleteSubDirectory") {
-            this.incrementPendingSubDirCount(this.pendingDeleteSubDirectoriesTracker, op.subdirName);
-        }
-        else if (op.type === "createSubDirectory") {
-            this.incrementPendingSubDirCount(this.pendingCreateSubDirectoriesTracker, op.subdirName);
-        }
-    }
     /**
      * Submit a create subdirectory operation.
      * @param op - The operation
      */
     submitCreateSubDirectoryMessage(op) {
-        this.throwIfDisposed();
-        this.updatePendingSubDirMessageCount(op);
         const localOpMetadata = {
             type: "createSubDir",
+            parentSubdir: this,
         };
         this.directory.submitDirectoryMessage(op, localOpMetadata);
     }
@@ -1487,11 +1548,10 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
      * @param subDir - Any subdirectory deleted by the op
      */
     submitDeleteSubDirectoryMessage(op, subDir) {
-        this.throwIfDisposed();
-        this.updatePendingSubDirMessageCount(op);
         const localOpMetadata = {
             type: "deleteSubDir",
             subDirectory: subDir,
+            parentSubdir: this,
         };
         this.directory.submitDirectoryMessage(op, localOpMetadata);
     }
@@ -1503,22 +1563,25 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
     resubmitSubDirectoryMessage(op, localOpMetadata) {
         // Only submit the op, if we have record for it, otherwise it is possible that the older instance
         // is already deleted, in which case we don't need to submit the op.
-        if (localOpMetadata.type === "createSubDir" &&
-            !this.pendingCreateSubDirectoriesTracker.has(op.subdirName)) {
-            return;
-        }
-        else if (localOpMetadata.type === "deleteSubDir" &&
-            !this.pendingDeleteSubDirectoriesTracker.has(op.subdirName)) {
-            return;
-        }
         if (localOpMetadata.type === "createSubDir") {
-            this.decrementPendingSubDirCount(this.pendingCreateSubDirectoriesTracker, op.subdirName);
-            this.submitCreateSubDirectoryMessage(op);
+            // For create operations, look specifically for createSubDirectory entries
+            const pendingEntry = (0, utils_js_1.findLast)(this.pendingSubDirectoryData, (entry) => entry.subdirName === op.subdirName && entry.type === "createSubDirectory");
+            if (pendingEntry !== undefined) {
+                (0, internal_1.assert)(pendingEntry.type === "createSubDirectory", 0xc33 /* pending entry should be createSubDirectory */);
+                // We should add the client id, since when reconnecting it can have a different client id.
+                pendingEntry.subdir.clientIds.add(this.runtime.clientId ?? "detached");
+                // We also need to undelete the subdirectory tree if it was previously deleted
+                this.undisposeSubdirectoryTree(pendingEntry.subdir);
+                this.submitCreateSubDirectoryMessage(op);
+            }
         }
         else if (localOpMetadata.type === "deleteSubDir") {
-            this.decrementPendingSubDirCount(this.pendingDeleteSubDirectoriesTracker, op.subdirName);
-            (0, internal_1.assert)(localOpMetadata.subDirectory !== undefined, 0xc08 /* localOpMetadata.subDirectory should be defined */);
-            this.submitDeleteSubDirectoryMessage(op, localOpMetadata.subDirectory);
+            (0, internal_1.assert)(localOpMetadata.subDirectory !== undefined, 0xc34 /* Subdirectory should exist */);
+            // For delete operations, look specifically for deleteSubDirectory entries
+            const pendingEntry = (0, utils_js_1.findLast)(this.pendingSubDirectoryData, (entry) => entry.subdirName === op.subdirName && entry.type === "deleteSubDirectory");
+            if (pendingEntry !== undefined) {
+                this.submitDeleteSubDirectoryMessage(op, localOpMetadata.subDirectory);
+            }
         }
     }
     /**
@@ -1559,7 +1622,7 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
     populateSubDirectory(subdirName, newSubDir) {
         this.throwIfDisposed();
         this.registerEventsOnSubDirectory(newSubDir, subdirName);
-        this._subdirectories.set(subdirName, newSubDir);
+        this._sequencedSubdirectories.set(subdirName, newSubDir);
     }
     /**
      * Rollback a local op
@@ -1572,9 +1635,13 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
         if (directoryOp.type === "clear") {
             // A pending clear will be last in the list, since it terminates all prior lifetimes.
             const pendingClear = this.pendingStorageData.pop();
-            (0, internal_1.assert)(pendingClear !== undefined &&
-                pendingClear.type === "clear" &&
-                localOpMetadata.type === "clear", 0xc09 /* Unexpected clear rollback */);
+            if (pendingClear === undefined) {
+                // If we can't find a pending entry then it's possible that we deleted an ack'd subdir
+                // from a remote delete subdir op. If that's the case then there is nothing to rollback
+                // since the pending data was removed with the subdirectory deletion.
+                return;
+            }
+            (0, internal_1.assert)(pendingClear.type === "clear" && localOpMetadata.type === "clear", 0xc35 /* Unexpected clear rollback */);
             for (const [key] of this.internalIterator()) {
                 const event = {
                     key,
@@ -1592,8 +1659,13 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
             // they were created, not when they were last modified.
             const pendingEntryIndex = (0, utils_js_1.findLastIndex)(this.pendingStorageData, (entry) => entry.type !== "clear" && entry.key === directoryOp.key);
             const pendingEntry = this.pendingStorageData[pendingEntryIndex];
-            (0, internal_1.assert)(pendingEntry !== undefined &&
-                (pendingEntry.type === "delete" || pendingEntry.type === "lifetime"), 0xc0a /* Unexpected pending data for set/delete op */);
+            if (pendingEntry === undefined) {
+                // If we can't find a pending entry then it's possible that we deleted an ack'd subdir
+                // from a remote delete subdir op. If that's the case then there is nothing to rollback
+                // since the pending data was removed with the subdirectory deletion.
+                return;
+            }
+            (0, internal_1.assert)(pendingEntry.type === "delete" || pendingEntry.type === "lifetime", 0xc36 /* Unexpected pending data for set/delete op */);
             if (pendingEntry.type === "delete") {
                 (0, internal_1.assert)(pendingEntry === localOpMetadata, 0xc0b /* Unexpected delete rollback */);
                 this.pendingStorageData.splice(pendingEntryIndex, 1);
@@ -1634,34 +1706,33 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
         else if (directoryOp.type === "createSubDirectory" &&
             localOpMetadata.type === "createSubDir") {
             const subdirName = directoryOp.subdirName;
-            (0, internal_1.assert)(subdirName !== undefined, 0x8af /* "subdirName" property is missing from "createSubDirectory" operation. */);
-            (0, internal_1.assert)(typeof subdirName === "string", 0x8b0 /* "subdirName" property in "createSubDirectory" operation is misconfigured. Expected a string. */);
-            this.deleteSubDirectoryCore(subdirName, true);
-            this.decrementPendingSubDirCount(this.pendingCreateSubDirectoriesTracker, subdirName);
+            const pendingEntryIndex = (0, utils_js_1.findLastIndex)(this.pendingSubDirectoryData, (entry) => entry.type === "createSubDirectory" && entry.subdirName === subdirName);
+            const pendingEntry = this.pendingSubDirectoryData[pendingEntryIndex];
+            (0, internal_1.assert)(pendingEntry !== undefined && pendingEntry.type === "createSubDirectory", 0xc37 /* Unexpected pending data for createSubDirectory op */);
+            // We still need to emit the disposed event for any locally created (and now
+            // rolled back) subdirectory trees so listeners can observer the lifecycle
+            // changes properly. We don't want to fully delete in case there is another
+            // operation that references the same subdirectory.
+            this.emitDisposeForSubdirTree(pendingEntry.subdir);
+            this.pendingSubDirectoryData.splice(pendingEntryIndex, 1);
+            this.emit("subDirectoryDeleted", subdirName, true, this);
         }
         else if (directoryOp.type === "deleteSubDirectory" &&
             localOpMetadata.type === "deleteSubDir") {
             const subdirName = directoryOp.subdirName;
-            (0, internal_1.assert)(subdirName !== undefined, 0x8b1 /* "subdirName" property is missing from "deleteSubDirectory" operation. */);
-            (0, internal_1.assert)(typeof subdirName === "string", 0x8b2 /* "subdirName" property in "deleteSubDirectory" operation is misconfigured. Expected a string. */);
-            if (localOpMetadata.subDirectory !== undefined) {
-                this.undeleteSubDirectoryTree(localOpMetadata.subDirectory);
-                // don't need to register events because deleting never unregistered
-                this._subdirectories.set(subdirName, localOpMetadata.subDirectory);
-                // Restore the record in creation tracker
-                if (isAcknowledgedOrDetached(localOpMetadata.subDirectory.seqData)) {
-                    this.ackedCreationSeqTracker.set(subdirName, {
-                        ...localOpMetadata.subDirectory.seqData,
-                    });
-                }
-                else {
-                    this.localCreationSeqTracker.set(subdirName, {
-                        ...localOpMetadata.subDirectory.seqData,
-                    });
-                }
-                this.emit("subDirectoryCreated", subdirName, true, this);
-            }
-            this.decrementPendingSubDirCount(this.pendingDeleteSubDirectoriesTracker, subdirName);
+            const pendingEntryIndex = (0, utils_js_1.findLastIndex)(this.pendingSubDirectoryData, (entry) => entry.type === "deleteSubDirectory" && entry.subdirName === subdirName);
+            const pendingEntry = this.pendingSubDirectoryData[pendingEntryIndex];
+            (0, internal_1.assert)(pendingEntry !== undefined && pendingEntry.type === "deleteSubDirectory", 0xc38 /* Unexpected pending data for deleteSubDirectory op */);
+            this.pendingSubDirectoryData.splice(pendingEntryIndex, 1);
+            // Restore the subdirectory
+            const subDirectoryToRestore = localOpMetadata.subDirectory;
+            (0, internal_1.assert)(subDirectoryToRestore !== undefined, 0xc39 /* Subdirectory should exist */);
+            // Recursively undispose all nested subdirectories before adding to the map
+            // This ensures the subdirectory is properly restored before being exposed
+            this.undisposeSubdirectoryTree(subDirectoryToRestore);
+            // Re-register events
+            this.registerEventsOnSubDirectory(subDirectoryToRestore, subdirName);
+            this.emit("subDirectoryCreated", subdirName, true, this);
         }
         else {
             throw new Error("Unsupported op for rollback");
@@ -1679,138 +1750,17 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
      * 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
-     */
-    isMessageForCurrentInstanceOfSubDirectory(msg) {
-        // 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 ((msg.clientId !== null && this.clientIds.has(msg.clientId)) ||
-            this.clientIds.has("detached") ||
-            (this.seqData.seq !== -1 && this.seqData.seq <= 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
-     */
-    needProcessSubDirectoryOperation(msg, op, local, localOpMetadata) {
-        assertNonNullClientId(msg.clientId);
-        const pendingDeleteCount = this.pendingDeleteSubDirectoriesTracker.get(op.subdirName);
-        const pendingCreateCount = this.pendingCreateSubDirectoriesTracker.get(op.subdirName);
-        if ((pendingDeleteCount !== undefined && pendingDeleteCount > 0) ||
-            (pendingCreateCount !== undefined && pendingCreateCount > 0)) {
-            if (local) {
-                (0, internal_1.assert)(localOpMetadata !== undefined, 0xc0d /* localOpMetadata should be defined */);
-                if (localOpMetadata.type === "deleteSubDir") {
-                    (0, internal_1.assert)(pendingDeleteCount !== undefined && pendingDeleteCount > 0, 0x6c2 /* pendingDeleteCount should exist */);
-                    this.decrementPendingSubDirCount(this.pendingDeleteSubDirectoriesTracker, op.subdirName);
-                }
-                else if (localOpMetadata.type === "createSubDir") {
-                    (0, internal_1.assert)(pendingCreateCount !== undefined && pendingCreateCount > 0, 0x6c3 /* pendingCreateCount should exist */);
-                    this.decrementPendingSubDirCount(this.pendingCreateSubDirectoriesTracker, op.subdirName);
-                }
-            }
-            if (op.type === "deleteSubDirectory") {
-                const resetSubDirectoryTree = (directory) => {
-                    if (!directory) {
-                        return;
-                    }
-                    // If this is 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.
-                    directory.sequencedStorageData.clear();
-                    directory.emit("clear", true, directory);
-                    // In case of delete op, we need to reset the creation seqNum, clientSeqNum 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.
-                    directory.seqData.seq = -1;
-                    directory.seqData.clientSeq = -1;
-                    directory.clientIds.clear();
-                    // Do the same thing for the subtree of the directory. If create is not pending for a child, then just
-                    // delete it.
-                    const subDirectories = directory.subdirectories();
-                    for (const [subDirName, subDir] of subDirectories) {
-                        if (directory.pendingCreateSubDirectoriesTracker.has(subDirName)) {
-                            resetSubDirectoryTree(subDir);
-                            continue;
-                        }
-                        directory.deleteSubDirectoryCore(subDirName, false);
-                    }
-                };
-                const subDirectory = this._subdirectories.get(op.subdirName);
-                // Clear the creation tracker record
-                this.ackedCreationSeqTracker.delete(op.subdirName);
-                resetSubDirectoryTree(subDirectory);
-            }
-            if (op.type === "createSubDirectory") {
-                const dir = this._subdirectories.get(op.subdirName);
-                // Child sub directory create seq number can't be lower than the parent subdirectory.
-                // The sequence number for multiple ops can be the same when multiple createSubDirectory occurs with grouped batching enabled, thus <= and not just <.
-                if (this.seqData.seq !== -1 && this.seqData.seq <= msg.sequenceNumber) {
-                    if (dir?.seqData.seq === -1) {
-                        // Only set the sequence data based on the first message
-                        dir.seqData.seq = msg.sequenceNumber;
-                        dir.seqData.clientSeq = msg.clientSequenceNumber;
-                        // set the creation seq in tracker
-                        if (!this.ackedCreationSeqTracker.has(op.subdirName) &&
-                            !this.pendingDeleteSubDirectoriesTracker.has(op.subdirName)) {
-                            this.ackedCreationSeqTracker.set(op.subdirName, {
-                                seq: msg.sequenceNumber,
-                                clientSeq: msg.clientSequenceNumber,
-                            });
-                            if (local) {
-                                this.localCreationSeqTracker.delete(op.subdirName);
-                            }
-                        }
-                    }
-                    // 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.seqData.seq <= msg.sequenceNumber) {
-                        dir.clientIds.add(msg.clientId);
-                    }
-                }
-            }
-            return false;
-        }
-        return !local;
-    }
-    /**
-     * 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 seqData - Sequence number and client 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.
-     */
-    createSubDirectoryCore(subdirName, local, seqData, clientId) {
-        const subdir = this._subdirectories.get(subdirName);
-        if (subdir === undefined) {
-            const absolutePath = posix.join(this.absolutePath, subdirName);
-            const subDir = new SubDirectory({ ...seqData }, new Set([clientId]), this.directory, this.runtime, this.serializer, absolutePath, this.logger);
-            /**
-             * Store the sequence numbers of newly created subdirectory to the proper creation tracker, based
-             * on whether the creation behavior has been ack'd or not
-             */
-            if (isAcknowledgedOrDetached(seqData)) {
-                this.ackedCreationSeqTracker.set(subdirName, { ...seqData });
-            }
-            else {
-                this.localCreationSeqTracker.set(subdirName, { ...seqData });
-            }
-            this.registerEventsOnSubDirectory(subDir, subdirName);
-            this._subdirectories.set(subdirName, subDir);
-            this.emit("subDirectoryCreated", subdirName, local, this);
-            return true;
-        }
-        else {
-            subdir.clientIds.add(clientId);
-        }
-        return false;
+     * @param targetSubdir - subdirectory instance we are targeting from local op metadata (if a local op)
+     */
+    isMessageForCurrentInstanceOfSubDirectory(msg, targetSubdir) {
+        // The message must be from this instance of the directory (if a local op) AND one of the following must be true:
+        // 1. The message was from the creator of this directory
+        // 2. This directory was created while detached
+        // 3. This directory was already live (known to other clients) and the op was created after the directory was created.
+        return ((targetSubdir === undefined || targetSubdir === this) &&
+            ((msg.clientId !== null && this.clientIds.has(msg.clientId)) ||
+                this.clientIds.has("detached") ||
+                (this.seqData.seq !== -1 && this.seqData.seq <= msg.referenceSequenceNumber)));
     }
     registerEventsOnSubDirectory(subDirectory, subDirName) {
         subDirectory.on("subDirectoryCreated", (relativePath, local) => {
@@ -1820,34 +1770,8 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
             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
-     */
-    deleteSubDirectoryCore(subdirName, local) {
-        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);
-            /**
-             * Remove the corresponding record from the proper creation tracker, based on whether the subdirectory has been
-             * ack'd already or still not committed yet (could be both).
-             */
-            if (this.ackedCreationSeqTracker.has(subdirName)) {
-                this.ackedCreationSeqTracker.delete(subdirName);
-            }
-            if (this.localCreationSeqTracker.has(subdirName)) {
-                this.localCreationSeqTracker.delete(subdirName);
-            }
-            this.disposeSubDirectoryTree(previousValue);
-            this.emit("subDirectoryDeleted", subdirName, local, this);
-        }
-        return previousValue;
-    }
     disposeSubDirectoryTree(directory) {
-        if (!directory) {
+        if (directory === undefined) {
             return;
         }
         // Dispose the subdirectory tree. This will dispose the subdirectories from bottom to top.
@@ -1855,17 +1779,76 @@ class SubDirectory extends client_utils_1.TypedEventEmitter {
         for (const [_, subDirectory] of subDirectories) {
             this.disposeSubDirectoryTree(subDirectory);
         }
+        // We need to reset the sequenced data as the previous directory is getting deleted and we will
+        // initialize again when we will receive op for the create again.
+        directory.clearSubDirectorySequencedData();
+        directory.dispose();
+    }
+    emitDisposeForSubdirTree(directory) {
+        if (directory === undefined || directory.disposed) {
+            return;
+        }
+        // Dispose the subdirectory tree. This will dispose the subdirectories from bottom to top.
+        const subDirectories = directory.subdirectories();
+        for (const [_, subDirectory] of subDirectories) {
+            this.emitDisposeForSubdirTree(subDirectory);
+        }
         if (typeof directory.dispose === "function") {
-            directory.dispose();
+            directory.emit("disposed", directory);
         }
     }
-    undeleteSubDirectoryTree(directory) {
-        // Restore deleted subdirectory tree. Need to undispose the current directory first, then get access to the iterator.
-        // This will unmark "deleted" from the subdirectories from top to bottom.
+    undisposeSubdirectoryTree(directory) {
+        // This will unmark "deleted" from the subdirectories from bottom to top.
+        for (const [_, subDirectory] of directory.getSubdirectoriesEvenIfDisposed()) {
+            this.undisposeSubdirectoryTree(subDirectory);
+        }
         directory.undispose();
-        for (const [_, subDirectory] of directory.subdirectories()) {
-            this.undeleteSubDirectoryTree(subDirectory);
+    }
+    /**
+     * Similar to {@link subdirectories}, but also includes subdirectories that are disposed.
+     */
+    getSubdirectoriesEvenIfDisposed() {
+        const sequencedSubdirs = [];
+        const sequencedSubdirNames = new Set([...this._sequencedSubdirectories.keys()]);
+        for (const subdirName of sequencedSubdirNames) {
+            const optimisticSubdir = this.getOptimisticSubDirectory(subdirName, true);
+            if (optimisticSubdir !== undefined) {
+                sequencedSubdirs.push([subdirName, optimisticSubdir]);
+            }
         }
+        const pendingSubdirNames = [
+            ...new Set(this.pendingSubDirectoryData
+                .map((entry) => entry.subdirName)
+                .filter((subdirName) => !sequencedSubdirNames.has(subdirName))),
+        ];
+        const pendingSubdirs = [];
+        for (const subdirName of pendingSubdirNames) {
+            const optimisticSubdir = this.getOptimisticSubDirectory(subdirName, true);
+            if (optimisticSubdir !== undefined) {
+                pendingSubdirs.push([subdirName, optimisticSubdir]);
+            }
+        }
+        const allSubdirs = [...sequencedSubdirs, ...pendingSubdirs];
+        const orderedSubdirs = allSubdirs.sort((a, b) => {
+            const aSeqData = a[1].seqData;
+            const bSeqData = b[1].seqData;
+            (0, internal_1.assert)(aSeqData !== undefined && bSeqData !== undefined, 0xc3a /* seqData should be defined */);
+            return seqDataComparator(aSeqData, bSeqData);
+        });
+        return orderedSubdirs[Symbol.iterator]();
+    }
+    /**
+     * Clears the sequenced data of a subdirectory but notably retains the pending
+     * storage data. This is done when disposing of a directory so if we need to
+     * re-create it, then we still have the pending ops.
+     */
+    clearSubDirectorySequencedData() {
+        this.seqData.seq = -1;
+        this.seqData.clientSeq = -1;
+        this.sequencedStorageData.clear();
+        this._sequencedSubdirectories.clear();
+        this.clientIds.clear();
+        this.clientIds.add(this.runtime.clientId ?? "detached");
     }
 }
 //# sourceMappingURL=directory.js.map