support frozen models (close #662)

Author: yyx990803

src/instance/scope.js

@@ -73,7 +73,7 @@ exports._initData = function () {
     }
   }
   // observe data
-  Observer.create(data).addVm(this)
+  Observer.create(data, this)
 }
 
 /**
@@ -121,7 +121,7 @@ exports._setData = function (newData) {
     }
   }
   oldData.__ob__.removeVm(this)
-  Observer.create(newData).addVm(this)
+  Observer.create(newData, this)
   this._digest()
 }
 

src/observer/index.js

@@ -5,39 +5,28 @@ var arrayMethods = require('./array')
 var arrayKeys = Object.getOwnPropertyNames(arrayMethods)
 require('./object')
 
-var uid = 0
-
-/**
- * Type enums
- */
-
-var ARRAY = 0
-var OBJECT = 1
-
 /**
  * Observer class that are attached to each observed
  * object. Once attached, the observer converts target
  * object's property keys into getter/setters that
  * collect dependencies and dispatches updates.
  *
  * @param {Array|Object} value
- * @param {Number} type
  * @constructor
  */
 
-function Observer (value, type) {
-  this.id = ++uid
+function Observer (value) {
   this.value = value
   this.active = true
   this.deps = []
   _.define(value, '__ob__', this)
-  if (type === ARRAY) {
+  if (_.isArray(value)) {
     var augment = config.proto && _.hasProto
       ? protoAugment
       : copyAugment
     augment(value, arrayMethods, arrayKeys)
     this.observeArray(value)
-  } else if (type === OBJECT) {
+  } else {
     this.walk(value)
   }
 }
@@ -50,25 +39,30 @@ function Observer (value, type) {
  * or the existing observer if the value already has one.
  *
  * @param {*} value
+ * @param {Vue} [vm]
  * @return {Observer|undefined}
  * @static
  */
 
-Observer.create = function (value) {
+Observer.create = function (value, vm) {
+  var ob
   if (
     value &&
     value.hasOwnProperty('__ob__') &&
     value.__ob__ instanceof Observer
   ) {
-    return value.__ob__
-  } else if (_.isArray(value)) {
-    return new Observer(value, ARRAY)
+    ob = value.__ob__
   } else if (
-    _.isPlainObject(value) &&
-    !value._isVue // avoid Vue instance
+    _.isObject(value) &&
+    !Object.isFrozen(value) &&
+    !value._isVue
   ) {
-    return new Observer(value, OBJECT)
+    ob = new Observer(value)
+  }
+  if (ob && vm) {
+    ob.addVm(vm)
   }
+  return ob
 }
 
 /**

test/unit/specs/misc_spec.js

@@ -140,4 +140,40 @@ describe('Misc', function () {
     })
   })
 
+  it('frozen model, root', function (done) {
+    var vm = new Vue({
+      el: document.createElement('div'),
+      template: '{{msg}}',
+      data: Object.freeze({
+        msg: 'hi!'
+      })
+    })
+    expect(vm.$el.textContent).toBe('hi!')
+    vm.msg = 'ho!'
+    Vue.nextTick(function () {
+      expect(vm.$el.textContent).toBe('hi!')
+      done()
+    })
+  })
+
+  it('frozen model, non-root', function (done) {
+    var vm = new Vue({
+      el: document.createElement('div'),
+      template: '{{msg}} {{frozen.msg}}',
+      data: {
+        msg: 'hi',
+        frozen: Object.freeze({
+          msg: 'frozen'
+        })
+      }
+    })
+    expect(vm.$el.textContent).toBe('hi frozen')
+    vm.msg = 'ho'
+    vm.frozen.msg = 'changed'
+    Vue.nextTick(function () {
+      expect(vm.$el.textContent).toBe('ho frozen')
+      done()
+    })
+  })
+
 })

test/unit/specs/observer/observer_spec.js

@@ -12,6 +12,9 @@ describe('Observer', function () {
     // avoid vue instance
     ob = Observer.create(new _.Vue())
     expect(ob).toBeUndefined()
+    // avoid frozen objects
+    ob = Observer.create(Object.freeze({}))
+    expect(ob).toBeUndefined()
   })
 
   it('create on object', function () {