fix(v-model): support calling methods in v-model expression

close #3993
This commit is contained in:
Evan You 2021-07-15 13:34:42 -04:00
parent 395572b593
commit 5af718ba41
2 changed files with 25 additions and 1 deletions

View File

@ -86,6 +86,7 @@ test('isMemberExpression', () => {
expect(isMemberExpression('obj[1][2].foo[3].bar.baz')).toBe(true) expect(isMemberExpression('obj[1][2].foo[3].bar.baz')).toBe(true)
expect(isMemberExpression(`a[b[c.d]][0]`)).toBe(true) expect(isMemberExpression(`a[b[c.d]][0]`)).toBe(true)
expect(isMemberExpression('obj?.foo')).toBe(true) expect(isMemberExpression('obj?.foo')).toBe(true)
expect(isMemberExpression('foo().test')).toBe(true)
// strings // strings
expect(isMemberExpression(`a['foo' + bar[baz]["qux"]]`)).toBe(true) expect(isMemberExpression(`a['foo' + bar[baz]["qux"]]`)).toBe(true)

View File

@ -59,6 +59,7 @@ export const isSimpleIdentifier = (name: string): boolean =>
const enum MemberExpLexState { const enum MemberExpLexState {
inMemberExp, inMemberExp,
inBrackets, inBrackets,
inParens,
inString inString
} }
@ -79,6 +80,7 @@ export const isMemberExpression = (path: string): boolean => {
let state = MemberExpLexState.inMemberExp let state = MemberExpLexState.inMemberExp
let stateStack: MemberExpLexState[] = [] let stateStack: MemberExpLexState[] = []
let currentOpenBracketCount = 0 let currentOpenBracketCount = 0
let currentOpenParensCount = 0
let currentStringType: "'" | '"' | '`' | null = null let currentStringType: "'" | '"' | '`' | null = null
for (let i = 0; i < path.length; i++) { for (let i = 0; i < path.length; i++) {
@ -89,6 +91,10 @@ export const isMemberExpression = (path: string): boolean => {
stateStack.push(state) stateStack.push(state)
state = MemberExpLexState.inBrackets state = MemberExpLexState.inBrackets
currentOpenBracketCount++ currentOpenBracketCount++
} else if (char === '(') {
stateStack.push(state)
state = MemberExpLexState.inParens
currentOpenParensCount++
} else if ( } else if (
!(i === 0 ? validFirstIdentCharRE : validIdentCharRE).test(char) !(i === 0 ? validFirstIdentCharRE : validIdentCharRE).test(char)
) { ) {
@ -108,6 +114,23 @@ export const isMemberExpression = (path: string): boolean => {
} }
} }
break break
case MemberExpLexState.inParens:
if (char === `'` || char === `"` || char === '`') {
stateStack.push(state)
state = MemberExpLexState.inString
currentStringType = char
} else if (char === `(`) {
currentOpenParensCount++
} else if (char === `)`) {
// if the exp ends as a call then it should not be considered valid
if (i === path.length - 1) {
return false
}
if (!--currentOpenParensCount) {
state = stateStack.pop()!
}
}
break
case MemberExpLexState.inString: case MemberExpLexState.inString:
if (char === currentStringType) { if (char === currentStringType) {
state = stateStack.pop()! state = stateStack.pop()!
@ -116,7 +139,7 @@ export const isMemberExpression = (path: string): boolean => {
break break
} }
} }
return !currentOpenBracketCount return !currentOpenBracketCount && !currentOpenParensCount
} }
export function getInnerRange( export function getInnerRange(