From 02d5330e50de62426d5ff62960f4795a8b57e0d9 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 8 Jun 2016 12:15:59 -0400
Subject: [PATCH] detect and warn against using keywords as property names

---
 src/compiler/error-detector.js              | 27 ++++++++++++++++++---
 test/unit/features/options/template.spec.js |  3 ++-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/compiler/error-detector.js b/src/compiler/error-detector.js
index c516f764..fb42fcbb 100644
--- a/src/compiler/error-detector.js
+++ b/src/compiler/error-detector.js
@@ -2,6 +2,12 @@
 
 import { dirRE } from './parser/index'
 
+const keywordRE = new RegExp('\\b' + (
+  'do,if,in,for,let,new,try,var,case,else,with,await,break,catch,class,const,' +
+  'super,throw,while,yield,delete,export,import,return,switch,typeof,default,' +
+  'extends,finally,continue,debugger,function,arguments,instanceof'
+).split(',').join('\\b|\\b') + '\\b')
+
 // detect problematic expressions in a template
 export function detectErrors (ast: ?ASTNode): Array<string> {
   const errors: Array<string> = []
@@ -32,9 +38,22 @@ function checkNode (node: ASTNode, errors: Array<string>) {
 }
 
 function checkExpression (exp: string, text: string, errors: Array<string>) {
-  try {
-    new Function(exp)
-  } catch (e) {
-    errors.push(`- invalid expression: ${text}`)
+  exp = stripToString(exp)
+  const keywordMatch = exp.match(keywordRE)
+  if (keywordMatch) {
+    errors.push(
+      `- avoid using JavaScript keyword as property name: ` +
+      `"${keywordMatch[0]}" in expression ${text}`
+    )
+  } else {
+    try {
+      new Function(exp)
+    } catch (e) {
+      errors.push(`- invalid expression: ${text}`)
+    }
   }
 }
+
+function stripToString (exp) {
+  return exp.replace(/^_s\((.*)\)$/, '$1')
+}
diff --git a/test/unit/features/options/template.spec.js b/test/unit/features/options/template.spec.js
index 65ea300c..60305bfa 100644
--- a/test/unit/features/options/template.spec.js
+++ b/test/unit/features/options/template.spec.js
@@ -53,10 +53,11 @@ describe('Options template', () => {
 
   it('warn error in generated function', () => {
     new Vue({
-      template: '<div v-if="!@">{{ a"" }}</div>'
+      template: '<div v-if="!@"><span>{{ a"" }}</span><span>{{ do + 1 }}</span></div>'
     }).$mount()
     expect('failed to compile template').toHaveBeenWarned()
     expect('invalid expression: v-if="!@"').toHaveBeenWarned()
     expect('invalid expression: {{ a"" }}').toHaveBeenWarned()
+    expect('avoid using JavaScript keyword as property name: "do" in expression {{ do + 1 }}').toHaveBeenWarned()
   })
 })