fix: stop throwing an error on hasModule when parent does not exists (

#1850) (#1851) fix #1850 Co-authored-by: Kia Ishii <[email protected]>
vuejs · Nov 5, 2020 · 12aabe4 · 12aabe4
1 parent 14222a3
commit 12aabe4
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/src/module/module-collection.js b/src/module/module-collection.js
@@ -72,7 +72,11 @@ export default class ModuleCollection {
     const parent = this.get(path.slice(0, -1))
     const key = path[path.length - 1]
 
-    return parent.hasChild(key)
+    if (parent) {
+      return parent.hasChild(key)
+    }
+
+    return false
   }
 }
 

diff --git a/test/unit/module/module-collection.spec.js b/test/unit/module/module-collection.spec.js
@@ -81,6 +81,23 @@ describe('ModuleCollection', () => {
     expect(collection.get(['a'])).toBe(undefined)
   })
 
+  it('isRegistered', () => {
+    const collection = new ModuleCollection({})
+
+    collection.register(['a'], {
+      state: { value: true }
+    })
+
+    collection.register(['a', 'b'], {
+      state: { value: false }
+    })
+
+    expect(collection.isRegistered(['a'])).toBe(true)
+    expect(collection.isRegistered(['a', 'b'])).toBe(true)
+    expect(collection.isRegistered(['c'])).toBe(false)
+    expect(collection.isRegistered(['c', 'd'])).toBe(false)
+  })
+
   it('does not unregister initial modules', () => {
     const collection = new ModuleCollection({
       modules: {

diff --git a/test/unit/modules.spec.js b/test/unit/modules.spec.js
@@ -91,6 +91,18 @@ describe('Modules', () => {
       expect(store.hasModule('bonjour')).toBe(false)
     })
 
+    it('dynamic module existance test with nested modules', () => {
+      const store = new Vuex.Store({})
+
+      store.registerModule('a', {})
+      store.registerModule(['a', 'b'], {})
+
+      expect(store.hasModule(['a'])).toBe(true)
+      expect(store.hasModule(['a', 'b'])).toBe(true)
+      expect(store.hasModule(['c'])).toBe(false)
+      expect(store.hasModule(['c', 'd'])).toBe(false)
+    })
+
     it('dynamic module registration preserving hydration', () => {
       const store = new Vuex.Store({})
       store.replaceState({ a: { foo: 'state' }})