theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(reactivity): reduce code of type check (#377)

Browse Source
This commit is contained in:
Junyan 2019-10-25 23:15:04 +08:00 committed by Evan You
parent a489f98a66
commit d76cfba7fb
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/reactivity/src/reactive.ts
View File

@ -1,4 +1,4 @@
import { isObject, toTypeString } from '@vue/shared' import { isObject, toRawType } from '@vue/shared'
import { mutableHandlers, readonlyHandlers } from './baseHandlers' import { mutableHandlers, readonlyHandlers } from './baseHandlers'
import { import {
mutableCollectionHandlers, mutableCollectionHandlers,
@ -29,16 +29,14 @@ const nonReactiveValues = new WeakSet<any>()
const collectionTypes = new Set<Function>([Set, Map, WeakMap, WeakSet]) const collectionTypes = new Set<Function>([Set, Map, WeakMap, WeakSet])
const isObservableType = /*#__PURE__*/ makeMap( const isObservableType = /*#__PURE__*/ makeMap(
['Object', 'Array', 'Map', 'Set', 'WeakMap', 'WeakSet'] 'Object,Array,Map,Set,WeakMap,WeakSet'
.map(t => `[object ${t}]`)
.join(',')
) )
const canObserve = (value: any): boolean => { const canObserve = (value: any): boolean => {
return ( return (
!value._isVue && !value._isVue &&
!value._isVNode && !value._isVNode &&
isObservableType(toTypeString(value)) && isObservableType(toRawType(value)) &&
!nonReactiveValues.has(value) !nonReactiveValues.has(value)
) )
} }

6
packages/runtime-core/src/componentProps.ts
View File

@ -10,7 +10,7 @@ import {
isObject, isObject,
isReservedProp, isReservedProp,
hasOwn, hasOwn,
toTypeString, toRawType,
PatchFlags, PatchFlags,
makeMap makeMap
} from '@vue/shared' } from '@vue/shared'
@ -390,10 +390,6 @@ function styleValue(value: unknown, type: string): string {
} }
} }
function toRawType(value: unknown): string {
return toTypeString(value).slice(8, -1)
}
function isExplicable(type: string): boolean { function isExplicable(type: string): boolean {
const explicitTypes = ['string', 'number', 'boolean'] const explicitTypes = ['string', 'number', 'boolean']
return explicitTypes.some(elem => type.toLowerCase() === elem) return explicitTypes.some(elem => type.toLowerCase() === elem)

4
packages/shared/src/index.ts
View File

@ -48,6 +48,10 @@ export const objectToString = Object.prototype.toString
export const toTypeString = (value: unknown): string => export const toTypeString = (value: unknown): string =>
objectToString.call(value) objectToString.call(value)
export function toRawType(value: unknown): string {
return toTypeString(value).slice(8, -1)
}
export const isPlainObject = (val: unknown): val is object => export const isPlainObject = (val: unknown): val is object =>
toTypeString(val) === '[object Object]' toTypeString(val) === '[object Object]'