wip: warn v-bind object ordering

This commit is contained in:
Evan You
2021-04-17 16:26:13 -04:00
parent bf41354abd
commit 2c31227e7c
2 changed files with 70 additions and 16 deletions

View File

@@ -55,6 +55,11 @@ import {
import { buildSlots } from './vSlot'
import { getConstantType } from './hoistStatic'
import { BindingTypes } from '../options'
import {
checkCompatEnabled,
CompilerDeprecationTypes,
isCompatEnabled
} from '../compat/compatConfig'
// some directive transforms (e.g. v-model) may return a symbol for runtime
// import, which should be used instead of a resolveDirective call.
@@ -450,8 +455,8 @@ export function buildProps(
} else {
// directives
const { name, arg, exp, loc } = prop
const isBind = name === 'bind'
const isOn = name === 'on'
const isVBind = name === 'bind'
const isVOn = name === 'on'
// skip v-slot - it is handled by its dedicated transform.
if (name === 'slot') {
@@ -469,17 +474,17 @@ export function buildProps(
// skip v-is and :is on <component>
if (
name === 'is' ||
(isBind && isComponentTag(tag) && isBindKey(arg, 'is'))
(isVBind && isComponentTag(tag) && isBindKey(arg, 'is'))
) {
continue
}
// skip v-on in SSR compilation
if (isOn && ssr) {
if (isVOn && ssr) {
continue
}
// special case for v-bind and v-on with no argument
if (!arg && (isBind || isOn)) {
if (!arg && (isVBind || isVOn)) {
hasDynamicKeys = true
if (exp) {
if (properties.length) {
@@ -488,7 +493,49 @@ export function buildProps(
)
properties = []
}
if (isBind) {
if (isVBind) {
if (__COMPAT__) {
if (__DEV__) {
const hasOverridableKeys = mergeArgs.some(arg => {
if (arg.type === NodeTypes.JS_OBJECT_EXPRESSION) {
return arg.properties.some(({ key }) => {
if (
key.type !== NodeTypes.SIMPLE_EXPRESSION ||
!key.isStatic
) {
return true
}
return (
key.content !== 'class' &&
key.content !== 'style' &&
!isOn(key.content)
)
})
} else {
// dynamic expression
return true
}
})
if (hasOverridableKeys) {
checkCompatEnabled(
CompilerDeprecationTypes.COMPILER_V_BIND_OBJECT_ORDER,
context,
loc
)
}
}
if (
isCompatEnabled(
CompilerDeprecationTypes.COMPILER_V_BIND_OBJECT_ORDER,
context
)
) {
mergeArgs.unshift(exp)
continue
}
}
mergeArgs.push(exp)
} else {
// v-on="obj" -> toHandlers(obj)
@@ -502,7 +549,7 @@ export function buildProps(
} else {
context.onError(
createCompilerError(
isBind
isVBind
? ErrorCodes.X_V_BIND_NO_EXPRESSION
: ErrorCodes.X_V_ON_NO_EXPRESSION,
loc