From 2b6ca9a7b6788bb7d76cfeeed5d531591f3c2c86 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 27 Aug 2019 15:01:01 -0400
Subject: [PATCH] test: fix deep watch for Map/Set

---
 .../runtime-core/__tests__/apiWatch.spec.ts   | 23 ++++++++++++++-----
 packages/runtime-core/src/apiWatch.ts         |  7 +++++-
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/packages/runtime-core/__tests__/apiWatch.spec.ts b/packages/runtime-core/__tests__/apiWatch.spec.ts
index 263864dfdc..d8854f0a51 100644
--- a/packages/runtime-core/__tests__/apiWatch.spec.ts
+++ b/packages/runtime-core/__tests__/apiWatch.spec.ts
@@ -261,34 +261,45 @@ describe('api: watch', () => {
         count: ref(0)
       },
       array: [1, 2, 3],
-      map: new Map([['a', 1], ['b', 2]])
+      map: new Map([['a', 1], ['b', 2]]),
+      set: new Set([1, 2, 3])
     })
 
     let dummy
     watch(
       () => state,
       state => {
-        dummy = [state.nested.count, state.array[0], state.map.get('a')]
+        dummy = [
+          state.nested.count,
+          state.array[0],
+          state.map.get('a'),
+          state.set.has(1)
+        ]
       },
       { deep: true }
     )
 
     await nextTick()
-    expect(dummy).toEqual([0, 1, 1])
+    expect(dummy).toEqual([0, 1, 1, true])
 
     state.nested.count++
     await nextTick()
-    expect(dummy).toEqual([1, 1, 1])
+    expect(dummy).toEqual([1, 1, 1, true])
 
     // nested array mutation
     state.array[0] = 2
     await nextTick()
-    expect(dummy).toEqual([1, 2, 1])
+    expect(dummy).toEqual([1, 2, 1, true])
 
     // nested map mutation
     state.map.set('a', 2)
     await nextTick()
-    expect(dummy).toEqual([1, 2, 2])
+    expect(dummy).toEqual([1, 2, 2, true])
+
+    // nested set mutation
+    state.set.delete(1)
+    await nextTick()
+    expect(dummy).toEqual([1, 2, 2, false])
   })
 
   it('lazy', async () => {
diff --git a/packages/runtime-core/src/apiWatch.ts b/packages/runtime-core/src/apiWatch.ts
index 943011f0fe..1a956c7344 100644
--- a/packages/runtime-core/src/apiWatch.ts
+++ b/packages/runtime-core/src/apiWatch.ts
@@ -164,7 +164,12 @@ function traverse(value: any, seen: Set<any> = new Set()) {
     for (let i = 0; i < value.length; i++) {
       traverse(value[i], seen)
     }
-  } else if (value instanceof Map || value instanceof Set) {
+  } else if (value instanceof Map) {
+    ;(value as any).forEach((v: any, key: any) => {
+      // to register mutation dep for existing keys
+      traverse(value.get(key), seen)
+    })
+  } else if (value instanceof Set) {
     ;(value as any).forEach((v: any) => {
       traverse(v, seen)
     })
-- 
2.47.3