|
|
@@ -4,43 +4,56 @@ import { OperationTypes } from './operations'
|
|
|
import { LOCKED } from './lock'
|
|
|
import { isObject, capitalize, hasOwn } from '@vue/shared'
|
|
|
|
|
|
-const toReactive = (value: any) => (isObject(value) ? reactive(value) : value)
|
|
|
-const toReadonly = (value: any) => (isObject(value) ? readonly(value) : value)
|
|
|
+export type CollectionTypes = IterableCollections | WeakCollections
|
|
|
|
|
|
-function get(target: any, key: any, wrap: (t: any) => any): any {
|
|
|
+type IterableCollections = Map<any, any> | Set<any>
|
|
|
+type WeakCollections = WeakMap<any, any> | WeakSet<any>
|
|
|
+type MapTypes = Map<any, any> | WeakMap<any, any>
|
|
|
+type SetTypes = Set<any> | WeakSet<any>
|
|
|
+
|
|
|
+const toReactive = <T extends unknown>(value: T): T =>
|
|
|
+ isObject(value) ? reactive(value) : value
|
|
|
+
|
|
|
+const toReadonly = <T extends unknown>(value: T): T =>
|
|
|
+ isObject(value) ? readonly(value) : value
|
|
|
+
|
|
|
+const getProto = <T extends CollectionTypes>(v: T): any =>
|
|
|
+ Reflect.getPrototypeOf(v)
|
|
|
+
|
|
|
+function get(
|
|
|
+ target: MapTypes,
|
|
|
+ key: unknown,
|
|
|
+ wrap: typeof toReactive | typeof toReadonly
|
|
|
+) {
|
|
|
target = toRaw(target)
|
|
|
key = toRaw(key)
|
|
|
- const proto: any = Reflect.getPrototypeOf(target)
|
|
|
track(target, OperationTypes.GET, key)
|
|
|
- const res = proto.get.call(target, key)
|
|
|
- return wrap(res)
|
|
|
+ return wrap(getProto(target).get.call(target, key))
|
|
|
}
|
|
|
|
|
|
-function has(this: any, key: any): boolean {
|
|
|
+function has(this: CollectionTypes, key: unknown): boolean {
|
|
|
const target = toRaw(this)
|
|
|
key = toRaw(key)
|
|
|
- const proto: any = Reflect.getPrototypeOf(target)
|
|
|
track(target, OperationTypes.HAS, key)
|
|
|
- return proto.has.call(target, key)
|
|
|
+ return getProto(target).has.call(target, key)
|
|
|
}
|
|
|
|
|
|
-function size(target: any) {
|
|
|
+function size(target: IterableCollections) {
|
|
|
target = toRaw(target)
|
|
|
- const proto = Reflect.getPrototypeOf(target)
|
|
|
track(target, OperationTypes.ITERATE)
|
|
|
- return Reflect.get(proto, 'size', target)
|
|
|
+ return Reflect.get(getProto(target), 'size', target)
|
|
|
}
|
|
|
|
|
|
-function add(this: any, value: any) {
|
|
|
+function add(this: SetTypes, value: unknown) {
|
|
|
value = toRaw(value)
|
|
|
const target = toRaw(this)
|
|
|
- const proto: any = Reflect.getPrototypeOf(this)
|
|
|
+ const proto = getProto(target)
|
|
|
const hadKey = proto.has.call(target, value)
|
|
|
const result = proto.add.call(target, value)
|
|
|
if (!hadKey) {
|
|
|
/* istanbul ignore else */
|
|
|
if (__DEV__) {
|
|
|
- trigger(target, OperationTypes.ADD, value, { value })
|
|
|
+ trigger(target, OperationTypes.ADD, value, { newValue: value })
|
|
|
} else {
|
|
|
trigger(target, OperationTypes.ADD, value)
|
|
|
}
|
|
|
@@ -48,10 +61,10 @@ function add(this: any, value: any) {
|
|
|
return result
|
|
|
}
|
|
|
|
|
|
-function set(this: any, key: any, value: any) {
|
|
|
+function set(this: MapTypes, key: unknown, value: unknown) {
|
|
|
value = toRaw(value)
|
|
|
const target = toRaw(this)
|
|
|
- const proto: any = Reflect.getPrototypeOf(this)
|
|
|
+ const proto = getProto(target)
|
|
|
const hadKey = proto.has.call(target, key)
|
|
|
const oldValue = proto.get.call(target, key)
|
|
|
const result = proto.set.call(target, key, value)
|
|
|
@@ -75,9 +88,9 @@ function set(this: any, key: any, value: any) {
|
|
|
return result
|
|
|
}
|
|
|
|
|
|
-function deleteEntry(this: any, key: any) {
|
|
|
+function deleteEntry(this: CollectionTypes, key: unknown) {
|
|
|
const target = toRaw(this)
|
|
|
- const proto: any = Reflect.getPrototypeOf(this)
|
|
|
+ const proto = getProto(target)
|
|
|
const hadKey = proto.has.call(target, key)
|
|
|
const oldValue = proto.get ? proto.get.call(target, key) : undefined
|
|
|
// forward the operation before queueing reactions
|
|
|
@@ -93,13 +106,16 @@ function deleteEntry(this: any, key: any) {
|
|
|
return result
|
|
|
}
|
|
|
|
|
|
-function clear(this: any) {
|
|
|
+function clear(this: IterableCollections) {
|
|
|
const target = toRaw(this)
|
|
|
- const proto: any = Reflect.getPrototypeOf(this)
|
|
|
const hadItems = target.size !== 0
|
|
|
- const oldTarget = target instanceof Map ? new Map(target) : new Set(target)
|
|
|
+ const oldTarget = __DEV__
|
|
|
+ ? target instanceof Map
|
|
|
+ ? new Map(target)
|
|
|
+ : new Set(target)
|
|
|
+ : undefined
|
|
|
// forward the operation before queueing reactions
|
|
|
- const result = proto.clear.call(target)
|
|
|
+ const result = getProto(target).clear.call(target)
|
|
|
if (hadItems) {
|
|
|
/* istanbul ignore else */
|
|
|
if (__DEV__) {
|
|
|
@@ -112,30 +128,32 @@ function clear(this: any) {
|
|
|
}
|
|
|
|
|
|
function createForEach(isReadonly: boolean) {
|
|
|
- return function forEach(this: any, callback: Function, thisArg?: any) {
|
|
|
+ return function forEach(
|
|
|
+ this: IterableCollections,
|
|
|
+ callback: Function,
|
|
|
+ thisArg?: unknown
|
|
|
+ ) {
|
|
|
const observed = this
|
|
|
const target = toRaw(observed)
|
|
|
- const proto: any = Reflect.getPrototypeOf(target)
|
|
|
const wrap = isReadonly ? toReadonly : toReactive
|
|
|
track(target, OperationTypes.ITERATE)
|
|
|
// important: create sure the callback is
|
|
|
// 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) {
|
|
|
+ function wrappedCallback(value: unknown, key: unknown) {
|
|
|
return callback.call(observed, wrap(value), wrap(key), observed)
|
|
|
}
|
|
|
- return proto.forEach.call(target, wrappedCallback, thisArg)
|
|
|
+ return getProto(target).forEach.call(target, wrappedCallback, thisArg)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
function createIterableMethod(method: string | symbol, isReadonly: boolean) {
|
|
|
- return function(this: any, ...args: any[]) {
|
|
|
+ return function(this: IterableCollections, ...args: unknown[]) {
|
|
|
const target = toRaw(this)
|
|
|
- const proto: any = Reflect.getPrototypeOf(target)
|
|
|
const isPair =
|
|
|
method === 'entries' ||
|
|
|
(method === Symbol.iterator && target instanceof Map)
|
|
|
- const innerIterator = proto[method].apply(target, args)
|
|
|
+ const innerIterator = getProto(target)[method].apply(target, args)
|
|
|
const wrap = isReadonly ? toReadonly : toReactive
|
|
|
track(target, OperationTypes.ITERATE)
|
|
|
// return a wrapped iterator which returns observed versions of the
|
|
|
@@ -163,7 +181,7 @@ function createReadonlyMethod(
|
|
|
method: Function,
|
|
|
type: OperationTypes
|
|
|
): Function {
|
|
|
- return function(this: any, ...args: any[]) {
|
|
|
+ return function(this: CollectionTypes, ...args: unknown[]) {
|
|
|
if (LOCKED) {
|
|
|
if (__DEV__) {
|
|
|
const key = args[0] ? `on key "${args[0]}" ` : ``
|
|
|
@@ -179,11 +197,11 @@ function createReadonlyMethod(
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-const mutableInstrumentations: any = {
|
|
|
- get(key: any) {
|
|
|
+const mutableInstrumentations: Record<string, Function> = {
|
|
|
+ get(this: MapTypes, key: unknown) {
|
|
|
return get(this, key, toReactive)
|
|
|
},
|
|
|
- get size() {
|
|
|
+ get size(this: IterableCollections) {
|
|
|
return size(this)
|
|
|
},
|
|
|
has,
|
|
|
@@ -194,11 +212,11 @@ const mutableInstrumentations: any = {
|
|
|
forEach: createForEach(false)
|
|
|
}
|
|
|
|
|
|
-const readonlyInstrumentations: any = {
|
|
|
- get(key: any) {
|
|
|
+const readonlyInstrumentations: Record<string, Function> = {
|
|
|
+ get(this: MapTypes, key: unknown) {
|
|
|
return get(this, key, toReadonly)
|
|
|
},
|
|
|
- get size() {
|
|
|
+ get size(this: IterableCollections) {
|
|
|
return size(this)
|
|
|
},
|
|
|
has,
|
|
|
@@ -211,26 +229,37 @@ const readonlyInstrumentations: any = {
|
|
|
|
|
|
const iteratorMethods = ['keys', 'values', 'entries', Symbol.iterator]
|
|
|
iteratorMethods.forEach(method => {
|
|
|
- mutableInstrumentations[method] = createIterableMethod(method, false)
|
|
|
- readonlyInstrumentations[method] = createIterableMethod(method, true)
|
|
|
+ mutableInstrumentations[method as string] = createIterableMethod(
|
|
|
+ method,
|
|
|
+ false
|
|
|
+ )
|
|
|
+ readonlyInstrumentations[method as string] = createIterableMethod(
|
|
|
+ method,
|
|
|
+ true
|
|
|
+ )
|
|
|
})
|
|
|
|
|
|
-function createInstrumentationGetter(instrumentations: any) {
|
|
|
- return function getInstrumented(
|
|
|
- target: any,
|
|
|
+function createInstrumentationGetter(
|
|
|
+ instrumentations: Record<string, Function>
|
|
|
+) {
|
|
|
+ return (
|
|
|
+ target: CollectionTypes,
|
|
|
key: string | symbol,
|
|
|
- receiver: any
|
|
|
- ) {
|
|
|
- target =
|
|
|
- hasOwn(instrumentations, key) && key in target ? instrumentations : target
|
|
|
- return Reflect.get(target, key, receiver)
|
|
|
- }
|
|
|
+ receiver: CollectionTypes
|
|
|
+ ) =>
|
|
|
+ Reflect.get(
|
|
|
+ hasOwn(instrumentations, key) && key in target
|
|
|
+ ? instrumentations
|
|
|
+ : target,
|
|
|
+ key,
|
|
|
+ receiver
|
|
|
+ )
|
|
|
}
|
|
|
|
|
|
-export const mutableCollectionHandlers: ProxyHandler<any> = {
|
|
|
+export const mutableCollectionHandlers: ProxyHandler<CollectionTypes> = {
|
|
|
get: createInstrumentationGetter(mutableInstrumentations)
|
|
|
}
|
|
|
|
|
|
-export const readonlyCollectionHandlers: ProxyHandler<any> = {
|
|
|
+export const readonlyCollectionHandlers: ProxyHandler<CollectionTypes> = {
|
|
|
get: createInstrumentationGetter(readonlyInstrumentations)
|
|
|
}
|