fix: toRaw typo (#429)

vuejs · Jul 5, 2020 · 9468f72 · 9468f72
1 parent 94d4d87
commit 9468f72
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/src/mixin.ts b/src/mixin.ts
@@ -222,6 +222,7 @@ export function mixin(Vue: VueConstructor) {
     if (isPlainObject(binding)) {
       const bindingObj = binding
       vmStateManager.set(vm, 'rawBindings', binding)
+
       Object.keys(binding).forEach((name) => {
         let bindingValue = bindingObj[name]
         // only make primitive value reactive
@@ -243,6 +244,7 @@ export function mixin(Vue: VueConstructor) {
         }
         asVmProperty(vm, name, bindingValue)
       })
+
       return
     }
 

diff --git a/src/reactivity/reactive.ts b/src/reactivity/reactive.ts
@@ -269,7 +269,7 @@ export function markRaw<T extends object>(obj: T): T {
 }
 
 export function toRaw<T>(observed: T): T {
-  if (isRaw(observe) || !Object.isExtensible(observed)) {
+  if (isRaw(observed) || !Object.isExtensible(observed)) {
     return observed
   }
 

diff --git a/src/reactivity/unwrap.ts b/src/reactivity/unwrap.ts
@@ -29,7 +29,10 @@ export function unwrapRefProxy(value: any, map = new WeakMap()) {
 
   // copy __ob__
   if (value.__ob__) {
-    Object.defineProperty(obj, '__ob__', value.__ob__)
+    Object.defineProperty(obj, '__ob__', {
+      enumerable: false,
+      value: value.__ob__,
+    })
   }
 
   for (const k of Object.keys(value)) {

diff --git a/test/setup.spec.js b/test/setup.spec.js
@@ -8,6 +8,7 @@ const {
   reactive,
   toRefs,
   markRaw,
+  toRaw,
 } = require('../src')
 
 describe('setup', () => {
@@ -548,6 +549,8 @@ describe('setup', () => {
       expect(
         JSON.parse(vm.$el.querySelector('#refList').textContent)
       ).toMatchObject([{ value: '1' }, { value: '2' }, { value: '3' }])
+
+      expect(warn).not.toHaveBeenCalled()
     })
 
     test('nested', () => {
@@ -614,6 +617,8 @@ describe('setup', () => {
       expect(vm.$el.querySelector('#nested_aaa_b').textContent).toBe('aaa')
       expect(vm.$el.querySelector('#nested_aaa_bb_c').textContent).toBe('aaa')
       expect(vm.$el.querySelector('#nested_aaa_bb_cc').textContent).toBe('aaa')
+
+      expect(warn).not.toHaveBeenCalled()
     })
 
     it('recursive', () => {
@@ -671,6 +676,8 @@ describe('setup', () => {
       expect(
         vm.$el.querySelector('#recursive_b_recursive_recursive_r').textContent
       ).toBe('r')
+
+      expect(warn).not.toHaveBeenCalled()
     })
 
     // #384
@@ -695,10 +702,14 @@ describe('setup', () => {
           value: 'r',
         },
       })
+
+      expect(warn).not.toHaveBeenCalled()
     })
 
     // #392
     it('should copy __ob__ and make toRaw work when passing via props', () => {
+      let propsObj = null
+
       const Foo = {
         template: '<p>{{obj.bar}}</p>',
         props: {
@@ -708,7 +719,7 @@ describe('setup', () => {
           },
         },
         setup(props) {
-          expect(toRaw(props.obj)).toEqual({ bar: 1 })
+          propsObj = toRaw(props.obj)
           return {}
         },
       }
@@ -722,6 +733,9 @@ describe('setup', () => {
       }).$mount()
 
       expect(vm.$el.textContent).toBe('1')
+      expect(propsObj).toEqual({ bar: 1 })
+
+      expect(warn).not.toHaveBeenCalled()
     })
   })