props default values

Author: yyx990803

src/compiler/compile.js

@@ -425,16 +425,16 @@ var identRE = require('../parsers/path').identRE
 function compileProps (el, propDescriptors) {
   var props = []
   var i = propDescriptors.length
-  var descriptor, name, assertions, value, path, prop, literal, single
+  var descriptor, name, options, value, path, prop, literal, single
   while (i--) {
     descriptor = propDescriptors[i]
     // normalize prop string/descriptor
     if (typeof descriptor === 'object') {
       name = descriptor.name
-      assertions = descriptor
+      options = descriptor
     } else {
       name = descriptor
-      assertions = null
+      options = null
     }
     // props could contain dashes, which will be
     // interpreted as minus calculations by the parser
@@ -461,7 +461,7 @@ function compileProps (el, propDescriptors) {
       name: name,
       raw: value,
       path: path,
-      assertions: assertions,
+      options: options,
       mode: propBindingModes.ONE_WAY
     }
     if (value !== null) {
@@ -495,7 +495,7 @@ function compileProps (el, propDescriptors) {
           }
         }
       }
-    } else if (assertions && assertions.required) {
+    } else if (options && options.required) {
       _.warn('Missing required prop: ' + name)
     }
     props.push(prop)
@@ -519,7 +519,10 @@ function makePropsLinkFn (props) {
       path = prop.path
       if (prop.raw === null) {
         // initialize undefined prop
-        vm._data[path] = undefined
+        vm._data[path] = (
+          prop.options &&
+          prop.options.default
+        ) || undefined
       } else if (prop.dynamic) {
         // dynamic prop
         if (vm._context) {

src/util/misc.js

@@ -9,11 +9,11 @@ var config = require('../config')
  */
 
 exports.assertProp = function (prop, value) {
-  var assertions = prop.assertions
-  if (!assertions) {
+  var options = prop.options
+  if (!options) {
     return true
   }
-  var type = assertions.type
+  var type = options.type
   var valid = true
   var expectedType
   if (type) {
@@ -48,7 +48,7 @@ exports.assertProp = function (prop, value) {
     )
     return false
   }
-  var validator = assertions.validator
+  var validator = options.validator
   if (validator) {
     if (!validator.call(null, value)) {
       _.warn(

test/unit/specs/compiler/compile_spec.js

@@ -156,7 +156,11 @@ if (_.inBrowser) {
         'twoway',
         'with-filter',
         'camelCase',
-        'boolean-literal'
+        'boolean-literal',
+        {
+          name: 'default-value',
+          default: 123
+        }
       ]
       var def = Vue.options.directives._prop
       el.setAttribute('a', '1')
@@ -204,7 +208,7 @@ if (_.inBrowser) {
       expect(args[3]).toBe(def)
       // literal and one time should've been set on the _data
       // and numbers should be casted
-      expect(Object.keys(vm._data).length).toBe(5)
+      expect(Object.keys(vm._data).length).toBe(6)
       expect(vm.a).toBe(1)
       expect(vm._data.a).toBe(1)
       expect(vm.someOtherAttr).toBe(2)
@@ -214,6 +218,7 @@ if (_.inBrowser) {
       expect(vm.booleanLiteral).toBe('from parent: true')
       expect(vm._data.booleanLiteral).toBe('from parent: true')
       expect(vm._data.camelCase).toBeUndefined()
+      expect(vm._data.defaultValue).toBe(123)
       // camelCase should've warn
       expect(hasWarned(_, 'using camelCase')).toBe(true)
     })