refactor: immutable -> readonly

diff --git a/packages/reactivity/__tests__/immutable.spec.ts b/packages/reactivity/__tests__/readonly.spec.ts
similarity index 73%
rename from packages/reactivity/__tests__/immutable.spec.ts
rename to packages/reactivity/__tests__/readonly.spec.ts
index 16889ebcc2daa0bee2da837cc6555d6e71e0888e..49209857a7fe532b703b0ba486730c43df502f6c 100644 (file)
--- a/packages/reactivity/__tests__/immutable.spec.ts
+++ b/packages/reactivity/__tests__/readonly.spec.ts
@@ -1,18 +1,18 @@
 import {
   reactive,
-  immutable,
+  readonly,
   toRaw,
   isReactive,
-  isImmutable,
+  isReadonly,
   markNonReactive,
-  markImmutable,
+  markReadonly,
   lock,
   unlock,
   effect,
   ref
 } from '../src'
 
-describe('reactivity/immutable', () => {
+describe('reactivity/readonly', () => {
   let warn: any
 
   beforeEach(() => {
@@ -25,18 +25,18 @@ describe('reactivity/immutable', () => {
   })
 
   describe('Object', () => {
-    it('should make nested values immutable', () => {
+    it('should make nested values readonly', () => {
       const original = { foo: 1, bar: { baz: 2 } }
-      const observed = immutable(original)
+      const observed = readonly(original)
       expect(observed).not.toBe(original)
       expect(isReactive(observed)).toBe(true)
-      expect(isImmutable(observed)).toBe(true)
+      expect(isReadonly(observed)).toBe(true)
       expect(isReactive(original)).toBe(false)
-      expect(isImmutable(original)).toBe(false)
+      expect(isReadonly(original)).toBe(false)
       expect(isReactive(observed.bar)).toBe(true)
-      expect(isImmutable(observed.bar)).toBe(true)
+      expect(isReadonly(observed.bar)).toBe(true)
       expect(isReactive(original.bar)).toBe(false)
-      expect(isImmutable(original.bar)).toBe(false)
+      expect(isReadonly(original.bar)).toBe(false)
       // get
       expect(observed.foo).toBe(1)
       // has
@@ -46,7 +46,7 @@ describe('reactivity/immutable', () => {
     })
 
     it('should not allow mutation', () => {
-      const observed: any = immutable({ foo: 1, bar: { baz: 2 } })
+      const observed: any = readonly({ foo: 1, bar: { baz: 2 } })
       observed.foo = 2
       expect(observed.foo).toBe(1)
       expect(warn).toHaveBeenCalledTimes(1)
@@ -62,7 +62,7 @@ describe('reactivity/immutable', () => {
     })
 
     it('should allow mutation when unlocked', () => {
-      const observed: any = immutable({ foo: 1, bar: { baz: 2 } })
+      const observed: any = readonly({ foo: 1, bar: { baz: 2 } })
       unlock()
       observed.prop = 2
       observed.bar.qux = 3
@@ -77,7 +77,7 @@ describe('reactivity/immutable', () => {
     })
 
     it('should not trigger effects when locked', () => {
-      const observed: any = immutable({ a: 1 })
+      const observed: any = readonly({ a: 1 })
       let dummy
       effect(() => {
         dummy = observed.a
@@ -89,7 +89,7 @@ describe('reactivity/immutable', () => {
     })
 
     it('should trigger effects when unlocked', () => {
-      const observed: any = immutable({ a: 1 })
+      const observed: any = readonly({ a: 1 })
       let dummy
       effect(() => {
         dummy = observed.a
@@ -104,18 +104,18 @@ describe('reactivity/immutable', () => {
   })
 
   describe('Array', () => {
-    it('should make nested values immutable', () => {
+    it('should make nested values readonly', () => {
       const original: any[] = [{ foo: 1 }]
-      const observed = immutable(original)
+      const observed = readonly(original)
       expect(observed).not.toBe(original)
       expect(isReactive(observed)).toBe(true)
-      expect(isImmutable(observed)).toBe(true)
+      expect(isReadonly(observed)).toBe(true)
       expect(isReactive(original)).toBe(false)
-      expect(isImmutable(original)).toBe(false)
+      expect(isReadonly(original)).toBe(false)
       expect(isReactive(observed[0])).toBe(true)
-      expect(isImmutable(observed[0])).toBe(true)
+      expect(isReadonly(observed[0])).toBe(true)
       expect(isReactive(original[0])).toBe(false)
-      expect(isImmutable(original[0])).toBe(false)
+      expect(isReadonly(original[0])).toBe(false)
       // get
       expect(observed[0].foo).toBe(1)
       // has
@@ -125,7 +125,7 @@ describe('reactivity/immutable', () => {
     })
 
     it('should not allow mutation', () => {
-      const observed: any = immutable([{ foo: 1 }])
+      const observed: any = readonly([{ foo: 1 }])
       observed[0] = 1
       expect(observed[0]).not.toBe(1)
       expect(warn).toHaveBeenCalledTimes(1)
@@ -147,7 +147,7 @@ describe('reactivity/immutable', () => {
     })
 
     it('should allow mutation when unlocked', () => {
-      const observed: any = immutable([{ foo: 1, bar: { baz: 2 } }])
+      const observed: any = readonly([{ foo: 1, bar: { baz: 2 } }])
       unlock()
       observed[1] = 2
       observed.push(3)
@@ -163,7 +163,7 @@ describe('reactivity/immutable', () => {
     })
 
     it('should not trigger effects when locked', () => {
-      const observed: any = immutable([{ a: 1 }])
+      const observed: any = readonly([{ a: 1 }])
       let dummy
       effect(() => {
         dummy = observed[0].a
@@ -178,7 +178,7 @@ describe('reactivity/immutable', () => {
     })
 
     it('should trigger effects when unlocked', () => {
-      const observed: any = immutable([{ a: 1 }])
+      const observed: any = readonly([{ a: 1 }])
       let dummy
       effect(() => {
         dummy = observed[0].a
@@ -205,24 +205,24 @@ describe('reactivity/immutable', () => {
   const maps = [Map, WeakMap]
   maps.forEach((Collection: any) => {
     describe(Collection.name, () => {
-      test('should make nested values immutable', () => {
+      test('should make nested values readonly', () => {
         const key1 = {}
         const key2 = {}
         const original = new Collection([[key1, {}], [key2, {}]])
-        const observed = immutable(original)
+        const observed = readonly(original)
         expect(observed).not.toBe(original)
         expect(isReactive(observed)).toBe(true)
-        expect(isImmutable(observed)).toBe(true)
+        expect(isReadonly(observed)).toBe(true)
         expect(isReactive(original)).toBe(false)
-        expect(isImmutable(original)).toBe(false)
+        expect(isReadonly(original)).toBe(false)
         expect(isReactive(observed.get(key1))).toBe(true)
-        expect(isImmutable(observed.get(key1))).toBe(true)
+        expect(isReadonly(observed.get(key1))).toBe(true)
         expect(isReactive(original.get(key1))).toBe(false)
-        expect(isImmutable(original.get(key1))).toBe(false)
+        expect(isReadonly(original.get(key1))).toBe(false)
       })
 
       test('should not allow mutation & not trigger effect', () => {
-        const map = immutable(new Collection())
+        const map = readonly(new Collection())
         const key = {}
         let dummy
         effect(() => {
@@ -236,7 +236,7 @@ describe('reactivity/immutable', () => {
       })
 
       test('should allow mutation & trigger effect when unlocked', () => {
-        const map = immutable(new Collection())
+        const map = readonly(new Collection())
         const isWeak = Collection === WeakMap
         const key = {}
         let dummy
@@ -253,20 +253,20 @@ describe('reactivity/immutable', () => {
       })
 
       if (Collection === Map) {
-        test('should retrive immutable values on iteration', () => {
+        test('should retrive readonly values on iteration', () => {
           const key1 = {}
           const key2 = {}
           const original = new Collection([[key1, {}], [key2, {}]])
-          const observed: any = immutable(original)
+          const observed: any = readonly(original)
           for (const [key, value] of observed) {
-            expect(isImmutable(key)).toBe(true)
-            expect(isImmutable(value)).toBe(true)
+            expect(isReadonly(key)).toBe(true)
+            expect(isReadonly(value)).toBe(true)
           }
           observed.forEach((value: any) => {
-            expect(isImmutable(value)).toBe(true)
+            expect(isReadonly(value)).toBe(true)
           })
           for (const value of observed.values()) {
-            expect(isImmutable(value)).toBe(true)
+            expect(isReadonly(value)).toBe(true)
           }
         })
       }
@@ -276,22 +276,22 @@ describe('reactivity/immutable', () => {
   const sets = [Set, WeakSet]
   sets.forEach((Collection: any) => {
     describe(Collection.name, () => {
-      test('should make nested values immutable', () => {
+      test('should make nested values readonly', () => {
         const key1 = {}
         const key2 = {}
         const original = new Collection([key1, key2])
-        const observed = immutable(original)
+        const observed = readonly(original)
         expect(observed).not.toBe(original)
         expect(isReactive(observed)).toBe(true)
-        expect(isImmutable(observed)).toBe(true)
+        expect(isReadonly(observed)).toBe(true)
         expect(isReactive(original)).toBe(false)
-        expect(isImmutable(original)).toBe(false)
+        expect(isReadonly(original)).toBe(false)
         expect(observed.has(reactive(key1))).toBe(true)
         expect(original.has(reactive(key1))).toBe(false)
       })
 
       test('should not allow mutation & not trigger effect', () => {
-        const set = immutable(new Collection())
+        const set = readonly(new Collection())
         const key = {}
         let dummy
         effect(() => {
@@ -305,7 +305,7 @@ describe('reactivity/immutable', () => {
       })
 
       test('should allow mutation & trigger effect when unlocked', () => {
-        const set = immutable(new Collection())
+        const set = readonly(new Collection())
         const key = {}
         let dummy
         effect(() => {
@@ -321,59 +321,59 @@ describe('reactivity/immutable', () => {
       })
 
       if (Collection === Set) {
-        test('should retrive immutable values on iteration', () => {
+        test('should retrive readonly values on iteration', () => {
           const original = new Collection([{}, {}])
-          const observed: any = immutable(original)
+          const observed: any = readonly(original)
           for (const value of observed) {
-            expect(isImmutable(value)).toBe(true)
+            expect(isReadonly(value)).toBe(true)
           }
           observed.forEach((value: any) => {
-            expect(isImmutable(value)).toBe(true)
+            expect(isReadonly(value)).toBe(true)
           })
           for (const value of observed.values()) {
-            expect(isImmutable(value)).toBe(true)
+            expect(isReadonly(value)).toBe(true)
           }
           for (const [v1, v2] of observed.entries()) {
-            expect(isImmutable(v1)).toBe(true)
-            expect(isImmutable(v2)).toBe(true)
+            expect(isReadonly(v1)).toBe(true)
+            expect(isReadonly(v2)).toBe(true)
           }
         })
       }
     })
   })
 
-  test('calling reactive on an immutable should return immutable', () => {
-    const a = immutable({})
+  test('calling reactive on an readonly should return readonly', () => {
+    const a = readonly({})
     const b = reactive(a)
-    expect(isImmutable(b)).toBe(true)
+    expect(isReadonly(b)).toBe(true)
     // should point to same original
     expect(toRaw(a)).toBe(toRaw(b))
   })
 
-  test('calling immutable on a reactive object should return immutable', () => {
+  test('calling readonly on a reactive object should return readonly', () => {
     const a = reactive({})
-    const b = immutable(a)
-    expect(isImmutable(b)).toBe(true)
+    const b = readonly(a)
+    expect(isReadonly(b)).toBe(true)
     // should point to same original
     expect(toRaw(a)).toBe(toRaw(b))
   })
 
   test('observing already observed value should return same Proxy', () => {
     const original = { foo: 1 }
-    const observed = immutable(original)
-    const observed2 = immutable(observed)
+    const observed = readonly(original)
+    const observed2 = readonly(observed)
     expect(observed2).toBe(observed)
   })
 
   test('observing the same value multiple times should return same Proxy', () => {
     const original = { foo: 1 }
-    const observed = immutable(original)
-    const observed2 = immutable(original)
+    const observed = readonly(original)
+    const observed2 = readonly(original)
     expect(observed2).toBe(observed)
   })
 
   test('markNonReactive', () => {
-    const obj = immutable({
+    const obj = readonly({
       foo: { a: 1 },
       bar: markNonReactive({ b: 2 })
     })
@@ -381,19 +381,19 @@ describe('reactivity/immutable', () => {
     expect(isReactive(obj.bar)).toBe(false)
   })
 
-  test('markImmutable', () => {
+  test('markReadonly', () => {
     const obj = reactive({
       foo: { a: 1 },
-      bar: markImmutable({ b: 2 })
+      bar: markReadonly({ b: 2 })
     })
     expect(isReactive(obj.foo)).toBe(true)
     expect(isReactive(obj.bar)).toBe(true)
-    expect(isImmutable(obj.foo)).toBe(false)
-    expect(isImmutable(obj.bar)).toBe(true)
+    expect(isReadonly(obj.foo)).toBe(false)
+    expect(isReadonly(obj.bar)).toBe(true)
   })
 
-  test('should make ref immutable', () => {
-    const n: any = immutable(ref(1))
+  test('should make ref readonly', () => {
+    const n: any = readonly(ref(1))
     n.value = 2
     expect(n.value).toBe(1)
     expect(warn).toHaveBeenCalledTimes(1)

diff --git a/packages/reactivity/src/baseHandlers.ts b/packages/reactivity/src/baseHandlers.ts
index 5724352cc8c3c004adda5d4d96b7c65c7979ec11..a25e528a87c9c3d4796354ab4c9605fd5759e306 100644 (file)
--- a/packages/reactivity/src/baseHandlers.ts
+++ b/packages/reactivity/src/baseHandlers.ts
@@ -1,4 +1,4 @@
-import { reactive, immutable, toRaw } from './reactive'
+import { reactive, readonly, toRaw } from './reactive'
 import { OperationTypes } from './operations'
 import { track, trigger } from './effect'
 import { LOCKED } from './lock'
@@ -13,7 +13,7 @@ const builtInSymbols = new Set(
     .filter(value => typeof value === 'symbol')
 )
 
-function createGetter(isImmutable: boolean) {
+function createGetter(isReadonly: boolean) {
   return function get(target: any, key: string | symbol, receiver: any) {
     const res = Reflect.get(target, key, receiver)
     if (typeof key === 'symbol' && builtInSymbols.has(key)) {
@@ -24,10 +24,10 @@ function createGetter(isImmutable: boolean) {
     }
     track(target, OperationTypes.GET, key)
     return isObject(res)
-      ? isImmutable
-        ? // need to lazy access immutable and reactive here to avoid
+      ? isReadonly
+        ? // need to lazy access readonly and reactive here to avoid
           // circular dependency
-          immutable(res)
+          readonly(res)
         : reactive(res)
       : res
   }
@@ -102,14 +102,14 @@ export const mutableHandlers: ProxyHandler<any> = {
   ownKeys
 }
 
-export const immutableHandlers: ProxyHandler<any> = {
+export const readonlyHandlers: ProxyHandler<any> = {
   get: createGetter(true),
 
   set(target: any, key: string | symbol, value: any, receiver: any): boolean {
     if (LOCKED) {
       if (__DEV__) {
         console.warn(
-          `Set operation on key "${key as any}" failed: target is immutable.`,
+          `Set operation on key "${key as any}" failed: target is readonly.`,
           target
         )
       }
@@ -123,7 +123,7 @@ export const immutableHandlers: ProxyHandler<any> = {
     if (LOCKED) {
       if (__DEV__) {
         console.warn(
-          `Delete operation on key "${key as any}" failed: target is immutable.`,
+          `Delete operation on key "${key as any}" failed: target is readonly.`,
           target
         )
       }

diff --git a/packages/reactivity/src/collectionHandlers.ts b/packages/reactivity/src/collectionHandlers.ts
index 02c1f8e96ac66f2d7a510c8e75f453792ddde0c0..11b194b7e52b55c467bec9e4c88a5b23435cb681 100644 (file)
--- a/packages/reactivity/src/collectionHandlers.ts
+++ b/packages/reactivity/src/collectionHandlers.ts
@@ -1,11 +1,11 @@
-import { toRaw, reactive, immutable } from './reactive'
+import { toRaw, reactive, readonly } from './reactive'
 import { track, trigger } from './effect'
 import { OperationTypes } from './operations'
 import { LOCKED } from './lock'
 import { isObject } from '@vue/shared'
 
 const toReactive = (value: any) => (isObject(value) ? reactive(value) : value)
-const toImmutable = (value: any) => (isObject(value) ? immutable(value) : value)
+const toReadonly = (value: any) => (isObject(value) ? readonly(value) : value)
 
 function get(target: any, key: any, wrap: (t: any) => any): any {
   target = toRaw(target)
@@ -111,16 +111,16 @@ function clear() {
   return result
 }
 
-function createForEach(isImmutable: boolean) {
+function createForEach(isReadonly: boolean) {
   return function forEach(callback: Function, thisArg?: any) {
     const observed = this
     const target = toRaw(observed)
     const proto: any = Reflect.getPrototypeOf(target)
-    const wrap = isImmutable ? toImmutable : toReactive
+    const wrap = isReadonly ? toReadonly : toReactive
     track(target, OperationTypes.ITERATE)
     // important: create sure the callback is
-    // 1. invoked with the observable map as `this` and 3rd arg
-    // 2. the value received should be a corresponding observable/immutable.
+    // 1. invoked with the reactive map as `this` and 3rd arg
+    // 2. the value received should be a corresponding reactive/readonly.
     function wrappedCallback(value: any, key: any) {
       return callback.call(observed, wrap(value), wrap(key), observed)
     }
@@ -128,7 +128,7 @@ function createForEach(isImmutable: boolean) {
   }
 }
 
-function createIterableMethod(method: string | symbol, isImmutable: boolean) {
+function createIterableMethod(method: string | symbol, isReadonly: boolean) {
   return function(...args: any[]) {
     const target = toRaw(this)
     const proto: any = Reflect.getPrototypeOf(target)
@@ -136,7 +136,7 @@ function createIterableMethod(method: string | symbol, isImmutable: boolean) {
       method === 'entries' ||
       (method === Symbol.iterator && target instanceof Map)
     const innerIterator = proto[method].apply(target, args)
-    const wrap = isImmutable ? toImmutable : toReactive
+    const wrap = isReadonly ? toReadonly : toReactive
     track(target, OperationTypes.ITERATE)
     // return a wrapped iterator which returns observed versions of the
     // values emitted from the real iterator
@@ -159,7 +159,7 @@ function createIterableMethod(method: string | symbol, isImmutable: boolean) {
   }
 }
 
-function createImmutableMethod(
+function createReadonlyMethod(
   method: Function,
   type: OperationTypes
 ): Function {
@@ -168,7 +168,7 @@ function createImmutableMethod(
       if (__DEV__) {
         const key = args[0] ? `on key "${args[0]}"` : ``
         console.warn(
-          `${type} operation ${key}failed: target is immutable.`,
+          `${type} operation ${key}failed: target is readonly.`,
           toRaw(this)
         )
       }
@@ -194,25 +194,25 @@ const mutableInstrumentations: any = {
   forEach: createForEach(false)
 }
 
-const immutableInstrumentations: any = {
+const readonlyInstrumentations: any = {
   get(key: any) {
-    return get(this, key, toImmutable)
+    return get(this, key, toReadonly)
   },
   get size() {
     return size(this)
   },
   has,
-  add: createImmutableMethod(add, OperationTypes.ADD),
-  set: createImmutableMethod(set, OperationTypes.SET),
-  delete: createImmutableMethod(deleteEntry, OperationTypes.DELETE),
-  clear: createImmutableMethod(clear, OperationTypes.CLEAR),
+  add: createReadonlyMethod(add, OperationTypes.ADD),
+  set: createReadonlyMethod(set, OperationTypes.SET),
+  delete: createReadonlyMethod(deleteEntry, OperationTypes.DELETE),
+  clear: createReadonlyMethod(clear, OperationTypes.CLEAR),
   forEach: createForEach(true)
 }
 
 const iteratorMethods = ['keys', 'values', 'entries', Symbol.iterator]
 iteratorMethods.forEach(method => {
   mutableInstrumentations[method] = createIterableMethod(method, false)
-  immutableInstrumentations[method] = createIterableMethod(method, true)
+  readonlyInstrumentations[method] = createIterableMethod(method, true)
 })
 
 function createInstrumentationGetter(instrumentations: any) {
@@ -233,6 +233,6 @@ export const mutableCollectionHandlers: ProxyHandler<any> = {
   get: createInstrumentationGetter(mutableInstrumentations)
 }
 
-export const immutableCollectionHandlers: ProxyHandler<any> = {
-  get: createInstrumentationGetter(immutableInstrumentations)
+export const readonlyCollectionHandlers: ProxyHandler<any> = {
+  get: createInstrumentationGetter(readonlyInstrumentations)
 }

diff --git a/packages/reactivity/src/index.ts b/packages/reactivity/src/index.ts
index 71893f636512d63dc53b1bd2bd2ca6477d01f008..0ba19b51548f930b72a7f38bc455feee4892d690 100644 (file)
--- a/packages/reactivity/src/index.ts
+++ b/packages/reactivity/src/index.ts
@@ -2,10 +2,10 @@ export { ref, isRef, toRefs, Ref, UnwrapRef } from './ref'
 export {
   reactive,
   isReactive,
-  immutable,
-  isImmutable,
+  readonly,
+  isReadonly,
   toRaw,
-  markImmutable,
+  markReadonly,
   markNonReactive
 } from './reactive'
 export { computed, ComputedRef, ComputedOptions } from './computed'

diff --git a/packages/reactivity/src/reactive.ts b/packages/reactivity/src/reactive.ts
index 49b8fd382ecf7a336fb557894581424695bc71c6..650525fedc0d8da041cc97415909c3bb2d6f4d95 100644 (file)
--- a/packages/reactivity/src/reactive.ts
+++ b/packages/reactivity/src/reactive.ts
@@ -1,9 +1,9 @@
 import { isObject } from '@vue/shared'
-import { mutableHandlers, immutableHandlers } from './baseHandlers'
+import { mutableHandlers, readonlyHandlers } from './baseHandlers'
 
 import {
   mutableCollectionHandlers,
-  immutableCollectionHandlers
+  readonlyCollectionHandlers
 } from './collectionHandlers'
 
 import { UnwrapNestedRefs } from './ref'
@@ -18,14 +18,14 @@ export type KeyToDepMap = Map<string | symbol, Dep>
 export const targetMap: WeakMap<any, KeyToDepMap> = new WeakMap()
 
 // WeakMaps that store {raw <-> observed} pairs.
-const rawToObserved: WeakMap<any, any> = new WeakMap()
-const observedToRaw: WeakMap<any, any> = new WeakMap()
-const rawToImmutable: WeakMap<any, any> = new WeakMap()
-const immutableToRaw: WeakMap<any, any> = new WeakMap()
+const rawToReactive: WeakMap<any, any> = new WeakMap()
+const reactiveToRaw: WeakMap<any, any> = new WeakMap()
+const rawToReadonly: WeakMap<any, any> = new WeakMap()
+const readonlyToRaw: WeakMap<any, any> = new WeakMap()
 
-// WeakSets for values that are marked immutable or non-reactive during
+// WeakSets for values that are marked readonly or non-reactive during
 // observable creation.
-const immutableValues: WeakSet<any> = new WeakSet()
+const readonlyValues: WeakSet<any> = new WeakSet()
 const nonReactiveValues: WeakSet<any> = new WeakSet()
 
 const collectionTypes: Set<any> = new Set([Set, Map, WeakMap, WeakSet])
@@ -42,38 +42,38 @@ const canObserve = (value: any): boolean => {
 
 export function reactive<T extends object>(target: T): UnwrapNestedRefs<T>
 export function reactive(target: object) {
-  // if trying to observe an immutable proxy, return the immutable version.
-  if (immutableToRaw.has(target)) {
+  // if trying to observe a readonly proxy, return the readonly version.
+  if (readonlyToRaw.has(target)) {
     return target
   }
-  // target is explicitly marked as immutable by user
-  if (immutableValues.has(target)) {
-    return immutable(target)
+  // target is explicitly marked as readonly by user
+  if (readonlyValues.has(target)) {
+    return readonly(target)
   }
   return createReactiveObject(
     target,
-    rawToObserved,
-    observedToRaw,
+    rawToReactive,
+    reactiveToRaw,
     mutableHandlers,
     mutableCollectionHandlers
   )
 }
 
-export function immutable<T extends object>(
+export function readonly<T extends object>(
   target: T
 ): Readonly<UnwrapNestedRefs<T>>
-export function immutable(target: object) {
+export function readonly(target: object) {
   // value is a mutable observable, retrive its original and return
   // a readonly version.
-  if (observedToRaw.has(target)) {
-    target = observedToRaw.get(target)
+  if (reactiveToRaw.has(target)) {
+    target = reactiveToRaw.get(target)
   }
   return createReactiveObject(
     target,
-    rawToImmutable,
-    immutableToRaw,
-    immutableHandlers,
-    immutableCollectionHandlers
+    rawToReadonly,
+    readonlyToRaw,
+    readonlyHandlers,
+    readonlyCollectionHandlers
   )
 }
 
@@ -116,19 +116,19 @@ function createReactiveObject(
 }
 
 export function isReactive(value: any): boolean {
-  return observedToRaw.has(value) || immutableToRaw.has(value)
+  return reactiveToRaw.has(value) || readonlyToRaw.has(value)
 }
 
-export function isImmutable(value: any): boolean {
-  return immutableToRaw.has(value)
+export function isReadonly(value: any): boolean {
+  return readonlyToRaw.has(value)
 }
 
 export function toRaw<T>(observed: T): T {
-  return observedToRaw.get(observed) || immutableToRaw.get(observed) || observed
+  return reactiveToRaw.get(observed) || readonlyToRaw.get(observed) || observed
 }
 
-export function markImmutable<T>(value: T): T {
-  immutableValues.add(value)
+export function markReadonly<T>(value: T): T {
+  readonlyValues.add(value)
   return value
 }
 

diff --git a/packages/runtime-core/src/apiReactivity.ts b/packages/runtime-core/src/apiReactivity.ts
index e8c69192bd3486b2f36818e1f7bdbdbcf612fcb9..76bcf283c95e82a7cd5b42323a8b6c56682ca081 100644 (file)
--- a/packages/runtime-core/src/apiReactivity.ts
+++ b/packages/runtime-core/src/apiReactivity.ts
@@ -4,10 +4,10 @@ export {
   toRefs,
   reactive,
   isReactive,
-  immutable,
-  isImmutable,
+  readonly,
+  isReadonly,
   toRaw,
-  markImmutable,
+  markReadonly,
   markNonReactive,
   effect,
   // types

diff --git a/packages/runtime-core/src/component.ts b/packages/runtime-core/src/component.ts
index 2982bb4aa43e5ccef4ceab7572cffaa290487bad..ad363a3bf2de6a59f5fada4a64168cd3deef487b 100644 (file)
--- a/packages/runtime-core/src/component.ts
+++ b/packages/runtime-core/src/component.ts
@@ -1,5 +1,5 @@
 import { VNode, normalizeVNode, VNodeChild } from './vnode'
-import { ReactiveEffect, UnwrapRef, reactive, immutable } from '@vue/reactivity'
+import { ReactiveEffect, UnwrapRef, reactive, readonly } from '@vue/reactivity'
 import { EMPTY_OBJ, isFunction, capitalize, invokeHandlers } from '@vue/shared'
 import { RenderProxyHandlers } from './componentProxy'
 import { ComponentPropsOptions, ExtractPropTypes } from './componentProps'
@@ -233,7 +233,7 @@ export function setupStatefulComponent(instance: ComponentInstance) {
     // so props change can be tracked by watchers
     // it will be updated in resolveProps() on updates before render
     const propsProxy = (instance.propsProxy = setup.length
-      ? immutable(instance.props)
+      ? readonly(instance.props)
       : null)
     const setupContext = (instance.setupContext =
       setup.length > 1 ? createSetupContext(instance) : null)

diff --git a/packages/runtime-core/src/componentProps.ts b/packages/runtime-core/src/componentProps.ts
index 1ef1f3d90ffd56d34d678950804e18b8aa866ed3..792657425903ced1236365baaf1d9f68949d9e3d 100644 (file)
--- a/packages/runtime-core/src/componentProps.ts
+++ b/packages/runtime-core/src/componentProps.ts
@@ -1,4 +1,4 @@
-import { immutable, toRaw, lock, unlock } from '@vue/reactivity'
+import { readonly, toRaw, lock, unlock } from '@vue/reactivity'
 import {
   EMPTY_OBJ,
   camelize,
@@ -114,7 +114,7 @@ export function resolveProps(
         props[key] = val
       }
 
-  // allow mutation of propsProxy (which is immutable by default)
+  // allow mutation of propsProxy (which is readonly by default)
   unlock()
 
   if (rawProps != null) {
@@ -179,13 +179,13 @@ export function resolveProps(
     }
   }
 
-  // lock immutable
+  // lock readonly
   lock()
 
-  instance.props = __DEV__ ? immutable(props) : props
+  instance.props = __DEV__ ? readonly(props) : props
   instance.attrs = options
     ? __DEV__
-      ? immutable(attrs)
+      ? readonly(attrs)
       : attrs
     : instance.props
 }