no longer alter Object __proto__

Author: yyx990803

changes.md

@@ -441,7 +441,7 @@ Vue.config.debug = true
 
 - #### New config option: `proto`
 
-  Be default, Vue.js alters observed data objects' `__proto__` when available for faster method interception/augmentation. This is perfectly fine when your data objects are plain JSON-derived objects. However if you want to use Vue's observation on object created with custom prototypes (e.g. from constructors), you can set `Vue.config.proto = false` to prohibit this behavior.
+  Be default, Vue.js alters the `__proto__` of observed Arrays when available for faster method interception/augmentation. This would only cause issue in the rare case when you are observing a subclass of the native Array. In that case, you can set `Vue.config.proto = false` to prohibit this behavior.
 
 ## Transition API Change
 

src/observer/array.js

@@ -1,5 +1,6 @@
 var _ = require('../util')
-var arrayAugmentations = Object.create(Array.prototype)
+var arrayProto = Array.prototype
+var arrayMethods = Object.create(arrayProto)
 
 /**
  * Intercept mutating methods and emit events
@@ -16,8 +17,8 @@ var arrayAugmentations = Object.create(Array.prototype)
 ]
 .forEach(function (method) {
   // cache original method
-  var original = Array.prototype[method]
-  _.define(arrayAugmentations, method, function mutator () {
+  var original = arrayProto[method]
+  _.define(arrayMethods, method, function mutator () {
     // avoid leaking arguments:
     // http://jsperf.com/closure-with-arguments
     var i = arguments.length
@@ -56,7 +57,7 @@ var arrayAugmentations = Object.create(Array.prototype)
  */
 
 _.define(
-  arrayAugmentations,
+  arrayProto,
   '$set',
   function $set (index, val) {
     if (index >= this.length) {
@@ -74,7 +75,7 @@ _.define(
  */
 
 _.define(
-  arrayAugmentations,
+  arrayProto,
   '$remove',
   function $remove (index) {
     if (typeof index !== 'number') {
@@ -86,4 +87,4 @@ _.define(
   }
 )
 
-module.exports = arrayAugmentations
+module.exports = arrayMethods

src/observer/index.js

@@ -1,10 +1,9 @@
 var _ = require('../util')
 var config = require('../config')
 var Binding = require('../binding')
-var arrayAugmentations = require('./array')
-var objectAugmentations = require('./object')
-var arrayKeys = Object.getOwnPropertyNames(arrayAugmentations)
-var objectKeys = Object.getOwnPropertyNames(objectAugmentations)
+var arrayMethods = require('./array')
+var arrayKeys = Object.getOwnPropertyNames(arrayMethods)
+require('./object')
 
 var uid = 0
 
@@ -61,14 +60,13 @@ function Observer (value, type) {
   this.active = true
   this.bindings = []
   _.define(value, '__ob__', this)
-  var augment = config.proto && _.hasProto
-    ? protoAugment
-    : copyAugment
   if (type === ARRAY) {
-    augment(value, arrayAugmentations, arrayKeys)
+    var augment = config.proto && _.hasProto
+      ? protoAugment
+      : copyAugment
+    augment(value, arrayMethods, arrayKeys)
     this.observeArray(value)
   } else if (type === OBJECT) {
-    augment(value, objectAugmentations, objectKeys)
     this.walk(value)
   }
 }

src/observer/object.js

@@ -1,5 +1,5 @@
 var _ = require('../util')
-var objectAgumentations = Object.create(Object.prototype)
+var objProto = Object.prototype
 
 /**
  * Add a new property to an observed object
@@ -11,15 +11,19 @@ var objectAgumentations = Object.create(Object.prototype)
  */
 
 _.define(
-  objectAgumentations,
+  objProto,
   '$add',
   function $add (key, val) {
+    var ob = this.__ob__
+    if (!ob) {
+      this[key] = val
+      return
+    }
     if (_.isReserved(key)) {
       _.warn('Refused to $add reserved key: ' + key)
       return
     }
     if (this.hasOwnProperty(key)) return
-    var ob = this.__ob__
     ob.convert(key, val)
     if (ob.vms) {
       var i = ob.vms.length
@@ -43,16 +47,20 @@ _.define(
  */
 
 _.define(
-  objectAgumentations,
+  objProto,
   '$delete',
   function $delete (key) {
+    var ob = this.__ob__
+    if (!ob) {
+      delete this[key]
+      return
+    }
     if (_.isReserved(key)) {
       _.warn('Refused to $add reserved key: ' + key)
       return
     }
     if (!this.hasOwnProperty(key)) return
     delete this[key]
-    var ob = this.__ob__
     if (ob.vms) {
       var i = ob.vms.length
       while (i--) {
@@ -64,6 +72,4 @@ _.define(
       ob.notify()
     }
   }
-)
-
-module.exports = objectAgumentations
+)

src/parse/path.js

@@ -287,31 +287,14 @@ exports.set = function (obj, path, val) {
     obj = obj[key]
     if (!_.isObject(obj)) {
       obj = {}
-      add(last, key, obj)
+      last.$add(key, obj)
     }
   }
   key = path[i]
   if (key in obj) {
     obj[key] = val
   } else {
-    add(obj, key, val)
-  }
-  return true
-}
-
-/**
- * Add a property to an object, using $add if target
- * has been augmented by Vue's observer.
- *
- * @param {Object} obj
- * @param {String} key
- * @param {*} val
- */
-
-function add (obj, key, val) {
-  if (obj.$add) {
     obj.$add(key, val)
-  } else {
-    obj[key] = val
   }
+  return true
 }

test/unit/specs/observer_spec.js

@@ -108,6 +108,10 @@ describe('Observer', function () {
     // should ignore deleting non-existing key
     obj.$delete('a')
     expect(binding.notify.calls.count()).toBe(2)
+    // should work on non-observed objects
+    var obj2 = { a: 1 }
+    obj2.$delete('a')
+    expect(obj2.hasOwnProperty('a')).toBe(false)
   })
 
   it('observing array mutation', function () {