Skip to content

Commit

Permalink
perf: optimize component props/slots internal object checks
Browse files Browse the repository at this point in the history
  • Loading branch information
yyx990803 committed Apr 12, 2024
1 parent 4bc9f39 commit 6af733d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
12 changes: 8 additions & 4 deletions packages/runtime-core/src/componentProps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
PatchFlags,
camelize,
capitalize,
def,
extend,
hasOwn,
hyphenate,
Expand All @@ -34,7 +33,6 @@ import {
setCurrentInstance,
} from './component'
import { isEmitListener } from './componentEmits'
import { InternalObjectKey } from './vnode'
import type { AppContext } from './apiCreateApp'
import { createPropsDefaultThis } from './compat/props'
import { isCompatEnabled, softAssertCompatEnabled } from './compat/compatConfig'
Expand Down Expand Up @@ -187,15 +185,21 @@ type NormalizedProp =
export type NormalizedProps = Record<string, NormalizedProp>
export type NormalizedPropsOptions = [NormalizedProps, string[]] | []

/**
* Used during vnode props normalization to check if the vnode props is the
* attrs object of a component via `Object.getPrototypeOf`. This is more
* performant than defining a non-enumerable property.
*/
export const attrsProto = {}

export function initProps(
instance: ComponentInternalInstance,
rawProps: Data | null,
isStateful: number, // result of bitwise flag comparison
isSSR = false,
) {
const props: Data = {}
const attrs: Data = {}
def(attrs, InternalObjectKey, 1)
const attrs: Data = Object.create(attrsProto)

instance.propsDefaults = Object.create(null)

Expand Down
4 changes: 1 addition & 3 deletions packages/runtime-core/src/componentSlots.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { type ComponentInternalInstance, currentInstance } from './component'
import {
InternalObjectKey,
type VNode,
type VNodeChild,
type VNodeNormalizedChildren,
Expand Down Expand Up @@ -174,7 +173,7 @@ export const initSlots = (
// we should avoid the proxy object polluting the slots of the internal instance
instance.slots = toRaw(children as InternalSlots)
// make compiler marker non-enumerable
def(children as InternalSlots, '_', type)
def(instance.slots, '_', type)
} else {
normalizeObjectSlots(
children as RawSlots,
Expand All @@ -188,7 +187,6 @@ export const initSlots = (
normalizeVNodeSlots(instance, children)
}
}
def(instance.slots, InternalObjectKey, 1)
}

export const updateSlots = (
Expand Down
7 changes: 3 additions & 4 deletions packages/runtime-core/src/vnode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ import { convertLegacyVModelProps } from './compat/componentVModel'
import { defineLegacyVNodeProperties } from './compat/renderFn'
import { ErrorCodes, callWithAsyncErrorHandling } from './errorHandling'
import type { ComponentPublicInstance } from './componentPublicInstance'
import { attrsProto } from './componentProps'

export const Fragment = Symbol.for('v-fgt') as any as {
__isFragment: true
Expand Down Expand Up @@ -404,8 +405,6 @@ const createVNodeWithArgsTransform = (
)
}

export const InternalObjectKey = `__vInternal`

const normalizeKey = ({ key }: VNodeProps): VNode['key'] =>
key != null ? key : null

Expand Down Expand Up @@ -618,7 +617,7 @@ function _createVNode(

export function guardReactiveProps(props: (Data & VNodeProps) | null) {
if (!props) return null
return isProxy(props) || InternalObjectKey in props
return isProxy(props) || Object.getPrototypeOf(props) === attrsProto
? extend({}, props)
: props
}
Expand Down Expand Up @@ -792,7 +791,7 @@ export function normalizeChildren(vnode: VNode, children: unknown) {
} else {
type = ShapeFlags.SLOTS_CHILDREN
const slotFlag = (children as RawSlots)._
if (!slotFlag && !(InternalObjectKey in children!)) {
if (!slotFlag) {
// if slots are not normalized, attach context instance
// (compiled / normalized slots already have context)
;(children as RawSlots)._ctx = currentRenderingInstance
Expand Down

0 comments on commit 6af733d

Please sign in to comment.