fix: immerjs#876 Ensure empty patch set for atomic set+delete on Map (i…

…mmerjs#878)
javirecamp · Jan 11, 2022 · e140918 · e140918
1 parent 8507692
commit e140918
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/__tests__/patch.js b/__tests__/patch.js
@@ -1319,3 +1319,24 @@ test("#791 patch for  nothing is stored as undefined", () => {
 
 	expect(applyPatches({}, patches)).toEqual(undefined)
 })
+
+test("#876 Ensure empty patch set for atomic set+delete on Map", () => {
+	{
+		const [newState, patches] = produceWithPatches(
+			new Map([["foo", "baz"]]),
+			draft => {
+				draft.set("foo", "bar")
+				draft.delete("foo")
+			}
+		)
+		expect(patches).toEqual([{op: "remove", path: ["foo"]}])
+	}
+
+	{
+		const [newState, patches] = produceWithPatches(new Map(), draft => {
+			draft.set("foo", "bar")
+			draft.delete("foo")
+		})
+		expect(patches).toEqual([])
+	}
+})
diff --git a/src/plugins/mapset.ts b/src/plugins/mapset.ts
@@ -99,7 +99,11 @@ export function enableMapSet() {
 			assertUnrevoked(state)
 			prepareMapCopy(state)
 			markChanged(state)
-			state.assigned_!.set(key, false)
+			if (state.base_.has(key)) {
+				state.assigned_!.set(key, false)
+			} else {
+				state.assigned_!.delete(key)
+			}
 			state.copy_!.delete(key)
 			return true
 		}