Added support for properties which were created with defineProperty o…

src/config.js

@@ -30,6 +30,14 @@ module.exports = {
 
  warnExpressionErrors: true,
 
+ /**
+ * Whether or not to handle fully object properties which
+ * are already backed by getters and seters. Depending on
+ * use case and environment, this might introduce non-neglible
+ * performance penalties.
+ */
+ convertAllProperties: false,
+
  /**
  * Internal flag to indicate the delimiters have been
  * changed.

src/observer/index.js

@@ -1,4 +1,5 @@
 var _ = require('../util')
+var config = require('../config')
 var Dep = require('./dep')
 var arrayMethods = require('./array')
 var arrayKeys = Object.getOwnPropertyNames(arrayMethods)
@@ -172,11 +173,27 @@ function copyAugment (target, src, keys) {
 
 function defineReactive (obj, key, val) {
  var dep = new Dep()
- var childOb = Observer.create(val)
+
+ var target = {
+ val: val
+ }
+
+ if (config.convertAllProperties) {
+ var property = Object.getOwnPropertyDescriptor(obj, key)
+ if (property && property.get && property.set) {
+ Object.defineProperty(target, 'val', {
+ get: _.bind(property.get, obj),
+ set: _.bind(property.set, obj)
+ })
+ }
+ }
+
+ var childOb = Observer.create(target.val)
  Object.defineProperty(obj, key, {
  enumerable: true,
  configurable: true,
  get: function metaGetter () {
+ var val = target.val
  if (Dep.target) {
  dep.depend()
  if (childOb) {
@@ -189,11 +206,11 @@ function defineReactive (obj, key, val) {
  }
  }
  }
- return val
+ return target.val
  },
  set: function metaSetter (newVal) {
- if (newVal === val) return
- val = newVal
+ if (newVal === target.val) return
+ target.val = newVal
  childOb = Observer.create(newVal)
  dep.notify()
  }

test/unit/specs/observer/observer_spec.js

@@ -1,6 +1,7 @@
 var Observer = require('../../../../src/observer')
 var Dep = require('../../../../src/observer/dep')
 var _ = require('../../../../src/util')
+var config = require('../../../../src/config')
 
 describe('Observer', function () {
 
@@ -38,6 +39,40 @@ describe('Observer', function () {
  expect(ob2).toBe(ob)
  })
 
+ it('create on already observed object', function () {
+ var previousConvertAllProperties = config.convertAllProperties
+ config.convertAllProperties = true
+
+ // on object
+ var obj = {}
+ var val = 0
+ Object.defineProperty(obj, 'a', {
+ configurable: true,
+ enumerable: true,
+ get: function () {
+ return val
+ },
+ set: function (v) {
+ val = v
+ }
+ })
+
+ var ob = Observer.create(obj)
+ expect(ob instanceof Observer).toBe(true)
+ expect(ob.value).toBe(obj)
+ expect(obj.__ob__).toBe(ob)
+
+ // should return existing ob on already observed objects
+ var ob2 = Observer.create(obj)
+ expect(ob2).toBe(ob)
+
+ // should call underlying setter
+ obj.a = 10
+ expect(val).toBe(10)
+
+ config.convertAllProperties = previousConvertAllProperties
+ })
+
  it('create on array', function () {
  // on object
  var arr = [{}, {}]
@@ -82,6 +117,45 @@ describe('Observer', function () {
  expect(watcher.update.calls.count()).toBe(3)
  })
 
+ it('observing object prop change on defined property', function () {
+ var previousConvertAllProperties = config.convertAllProperties
+ config.convertAllProperties = true
+
+ var obj = { val: 2 }
+ Object.defineProperty(obj, 'a', {
+ configurable: true,
+ enumerable: true,
+ get: function () {
+ return this.val
+ },
+ set: function (v) {
+ this.val = v
+ return this.val
+ }
+ })
+
+ Observer.create(obj)
+ // mock a watcher!
+ var watcher = {
+ deps: [],
+ addDep: function (dep) {
+ this.deps.push(dep)
+ dep.addSub(this)
+ },
+ update: jasmine.createSpy()
+ }
+ // collect dep
+ Dep.target = watcher
+ expect(obj.a).toBe(2) // Make sure 'this' is preserved
+ Dep.target = null
+ obj.a = 3
+ expect(obj.val).toBe(3) // make sure 'setter' was called
+ obj.val = 5
+ expect(obj.a).toBe(5) // make sure 'getter' was called
+
+ config.convertAllProperties = previousConvertAllProperties
+ })
+
  it('observing set/delete', function () {
  var obj = { a: 1 }
  var ob = Observer.create(obj)