feat(option): support merging like data

Author: posva

src/index.js

@@ -146,16 +146,19 @@ function bind ({ vm, key, ref }) {
 
 function install (Vue, options) {
   const strategies = Vue.config.optionMergeStrategies
-  strategies.firestore = strategies.methods
+  strategies.firestore = strategies.provide
 
   Vue.mixin({
     created () {
       const { firestore } = this.$options
       this._firestoreUnbinds = Object.create(null)
       this.$firestoreRefs = Object.create(null)
       if (!firestore) return
-      Object.keys(firestore).forEach(key => {
-        this.$bind(key, firestore[key])
+      const options = typeof firestore === 'function'
+        ? firestore.call(this, this)
+        : firestore
+      Object.keys(options).forEach(key => {
+        this.$bind(key, options[key])
       })
     },
 

test/merging.spec.js

@@ -6,7 +6,7 @@ import {
 
 Vue.use(Vuefire)
 
-let mWithObjA, mWithObjB
+let mWithObjA, mWithObjB, mWithFn
 beforeEach(async () => {
   mWithObjA = {
     firestore: {
@@ -21,6 +21,15 @@ beforeEach(async () => {
       c: db.collection(4)
     }
   }
+
+  mWithFn = {
+    firestore () {
+      return {
+        a: db.collection(5),
+        c: db.collection(6)
+      }
+    }
+  }
 })
 
 test('should merge properties', () => {
@@ -35,4 +44,25 @@ test('should merge properties', () => {
   })
 })
 
-test('TODO: should merge two functions')
+test('supports function syntax', () => {
+  const vm = new Vue({
+    mixins: [mWithFn],
+    render: h => h('p', 'foo')
+  })
+  expect(vm.$firestoreRefs).toEqual({
+    a: db.collection(5),
+    c: db.collection(6)
+  })
+})
+
+test('should merge two functions', () => {
+  const vm = new Vue({
+    mixins: [mWithObjA, mWithObjB, mWithFn],
+    render: h => h('p', 'foo')
+  })
+  expect(vm.$firestoreRefs).toEqual({
+    a: db.collection(5),
+    b: db.collection(2),
+    c: db.collection(6)
+  })
+})