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

package/lib/packageVersion.js

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export const pkgName = "@fluidframework/map";
-export const pkgVersion = "2.0.0-dev.4.1.0.148229";
+export const pkgVersion = "2.0.0-dev.4.2.0.153917";
 //# sourceMappingURL=packageVersion.js.map

package/lib/packageVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,qBAAqB,CAAC;AAC7C,MAAM,CAAC,MAAM,UAAU,GAAG,wBAAwB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/map\";\nexport const pkgVersion = \"2.0.0-dev.4.1.0.148229\";\n"]}
+{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,qBAAqB,CAAC;AAC7C,MAAM,CAAC,MAAM,UAAU,GAAG,wBAAwB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/map\";\nexport const pkgVersion = \"2.0.0-dev.4.2.0.153917\";\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/map",
-  "version": "2.0.0-dev.4.1.0.148229",
+  "version": "2.0.0-dev.4.2.0.153917",
   "description": "Distributed map",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -37,27 +37,27 @@
   "dependencies": {
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/common-utils": "^1.1.1",
-    "@fluidframework/container-utils": "2.0.0-dev.4.1.0.148229",
-    "@fluidframework/core-interfaces": "2.0.0-dev.4.1.0.148229",
-    "@fluidframework/datastore-definitions": "2.0.0-dev.4.1.0.148229",
-    "@fluidframework/driver-utils": "2.0.0-dev.4.1.0.148229",
+    "@fluidframework/container-utils": "2.0.0-dev.4.2.0.153917",
+    "@fluidframework/core-interfaces": "2.0.0-dev.4.2.0.153917",
+    "@fluidframework/datastore-definitions": "2.0.0-dev.4.2.0.153917",
+    "@fluidframework/driver-utils": "2.0.0-dev.4.2.0.153917",
     "@fluidframework/protocol-definitions": "^1.1.0",
-    "@fluidframework/runtime-definitions": "2.0.0-dev.4.1.0.148229",
-    "@fluidframework/runtime-utils": "2.0.0-dev.4.1.0.148229",
-    "@fluidframework/shared-object-base": "2.0.0-dev.4.1.0.148229",
+    "@fluidframework/runtime-definitions": "2.0.0-dev.4.2.0.153917",
+    "@fluidframework/runtime-utils": "2.0.0-dev.4.2.0.153917",
+    "@fluidframework/shared-object-base": "2.0.0-dev.4.2.0.153917",
     "path-browserify": "^1.0.1"
   },
   "devDependencies": {
-    "@fluid-internal/stochastic-test-utils": "2.0.0-dev.4.1.0.148229",
-    "@fluid-internal/test-dds-utils": "2.0.0-dev.4.1.0.148229",
-    "@fluid-tools/benchmark": "0.47.0-140906",
-    "@fluid-tools/build-cli": "^0.13.1",
+    "@fluid-internal/stochastic-test-utils": "2.0.0-dev.4.2.0.153917",
+    "@fluid-internal/test-dds-utils": "2.0.0-dev.4.2.0.153917",
+    "@fluid-tools/benchmark": "^0.47.0",
+    "@fluid-tools/build-cli": "^0.15.0",
     "@fluidframework/build-common": "^1.1.0",
-    "@fluidframework/build-tools": "^0.13.1",
+    "@fluidframework/build-tools": "^0.15.0",
     "@fluidframework/eslint-config-fluid": "^2.0.0",
     "@fluidframework/map-previous": "npm:@fluidframework/map@2.0.0-internal.4.0.0",
-    "@fluidframework/mocha-test-setup": "2.0.0-dev.4.1.0.148229",
-    "@fluidframework/test-runtime-utils": "2.0.0-dev.4.1.0.148229",
+    "@fluidframework/mocha-test-setup": "2.0.0-dev.4.2.0.153917",
+    "@fluidframework/test-runtime-utils": "2.0.0-dev.4.2.0.153917",
     "@microsoft/api-extractor": "^7.34.4",
     "@types/mocha": "^9.1.1",
     "@types/node": "^14.18.38",

package/src/directory.ts

@@ -743,29 +743,30 @@ export class SharedDirectory
 	}
 
 	/**
-	 * This checks if there is pending delete op for local delete for a subdirectory.
+	 * 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.
 	 */
 	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;
+			return false;
 		}
-		const index = absolutePath.lastIndexOf(posix.sep);
-		const parentAbsPath = absolutePath.substring(0, index);
-		return this.getWorkingDirectory(parentAbsPath) as SubDirectory;
+		let currentParent = this.root;
+		const nodeList = absolutePath.split(posix.sep);
+		let start = 1;
+		while (start < nodeList.length) {
+			const subDirName = nodeList[start];
+			if (currentParent.isSubDirectoryDeletePending(subDirName)) {
+				return true;
+			}
+			currentParent = currentParent.getSubDirectory(subDirName) as SubDirectory;
+			if (currentParent === undefined) {
+				return true;
+			}
+			start += 1;
+		}
+		return false;
 	}
 
 	/**
@@ -780,8 +781,8 @@ export class SharedDirectory
 				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 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)) {
 					subdir.processClearMessage(msg, op, local, localOpMetadata);
 				}
@@ -807,8 +808,8 @@ export class SharedDirectory
 				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 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)) {
 					subdir.processDeleteMessage(msg, op, local, localOpMetadata);
 				}
@@ -836,8 +837,8 @@ export class SharedDirectory
 				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 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 context = local ? undefined : this.makeLocal(op.key, op.path, op.value);
 					subdir.processSetMessage(msg, op, context, local, localOpMetadata);
@@ -866,7 +867,9 @@ export class SharedDirectory
 				localOpMetadata,
 			) => {
 				const parentSubdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
-				if (parentSubdir) {
+				// 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)) {
 					parentSubdir.processCreateSubDirectoryMessage(msg, op, local, localOpMetadata);
 				}
 			},
@@ -895,7 +898,9 @@ export class SharedDirectory
 				localOpMetadata,
 			) => {
 				const parentSubdir = this.getWorkingDirectory(op.path) as SubDirectory | undefined;
-				if (parentSubdir) {
+				// 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)) {
 					parentSubdir.processDeleteSubDirectoryMessage(msg, op, local, localOpMetadata);
 				}
 			},

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/map";
-export const pkgVersion = "2.0.0-dev.4.1.0.148229";
+export const pkgVersion = "2.0.0-dev.4.2.0.153917";