let vm.$watch take an options object instead of unnamed arguments

Author: yyx990803

src/api/data.js

@@ -62,21 +62,23 @@ exports.$delete = function (key) {
  *
  * @param {String} exp
  * @param {Function} cb
- * @param {Boolean} [deep]
- * @param {Boolean} [immediate]
+ * @param {Object} [options]
+ *                 - {Boolean} deep
+ *                 - {Boolean} immediate
+ *                 - {Boolean} user
  * @return {Function} - unwatchFn
  */
 
-exports.$watch = function (exp, cb, deep, immediate) {
+exports.$watch = function (exp, cb, options) {
   var vm = this
   var wrappedCb = function (val, oldVal) {
     cb.call(vm, val, oldVal)
   }
   var watcher = new Watcher(vm, exp, wrappedCb, {
-    deep: deep,
-    user: true
+    deep: options && options.deep,
+    user: !options || options.user !== false
   })
-  if (immediate) {
+  if (options && options.immediate) {
     wrappedCb(watcher.value)
   }
   return function unwatchFn () {
@@ -147,4 +149,4 @@ exports.$log = function (path) {
     data = JSON.parse(JSON.stringify(data))
   }
   console.log(data)
-}
+}

src/api/global.js

@@ -136,4 +136,4 @@ function createAssetRegisters (Constructor) {
   }
 }
 
-createAssetRegisters(exports)
+createAssetRegisters(exports)

test/unit/specs/api/data_spec.js

@@ -89,7 +89,9 @@ describe('Data API', function () {
   it('$watch', function (done) {
     var spy = jasmine.createSpy()
     // test immediate invoke
-    var unwatch = vm.$watch('a + b.c', spy, false, true)
+    var unwatch = vm.$watch('a + b.c', spy, {
+      immediate: true
+    })
     expect(spy).toHaveBeenCalledWith(3, undefined)
     vm.a = 2
     nextTick(function () {
@@ -109,7 +111,7 @@ describe('Data API', function () {
     // test immediate invoke
     var unwatch = vm.$watch(function () {
       return this.a + this.b.c
-    }, spy, false, true)
+    }, spy, { immediate: true })
     expect(spy).toHaveBeenCalledWith(3, undefined)
     vm.a = 2
     nextTick(function () {
@@ -127,7 +129,9 @@ describe('Data API', function () {
   it('deep $watch', function (done) {
     var oldB = vm.b
     var spy = jasmine.createSpy()
-    vm.$watch('b', spy, true)
+    vm.$watch('b', spy, {
+      deep: true
+    })
     vm.b.c = 3
     nextTick(function () {
       expect(spy).toHaveBeenCalledWith(oldB, oldB)