Fixed function prop default issue

Author: itsfrank

README.md

@@ -86,7 +86,11 @@ class MyComponent {
     })
     someDefaultProp:string = 'some default value'; 
 
-    @Prop someObjProp:{default:string} = {default: 'value'}; //vue-typescript makes sure to deep clone default values for array and object types
+    @Prop someObjProp:{some_default:string} = {some_default: 'value'}; //vue-typescript makes sure to deep clone default values for array and object types
+
+    @Prop someFuncProp(){ //defined functions decorated with prop are treated as the default value
+        console.log('logged from default function!');
+    }
 
     someVar:string = 'Hello!';
 
@@ -111,6 +115,12 @@ Vue.component('my-component', {
                     default: 'value'
                 }
             }
+        },
+        someFuncProp: {
+            type: Function //if it finds the default is a function, it automatically sets the type
+            default: function(){
+                console.log('logged from default function!');
+            }
         }
     },
     data: function(){

lib/vuecomponent.js

@@ -92,16 +92,20 @@ function createDecorator(name?:string, options?:vuejs.ComponentOption){
         }
 
         for (key in options.props) {
-            var default_val:any = options.data[key];
-            if (default_val !=  null && default_val !=  undefined) {
-                if (!options.props[key]) options.props[key] = {};
-                if (typeof default_val == 'object'){
+            var default_val = options.data[key];
+            if (default_val == null || default_val == undefined) default_val = options.methods[key]
+            if (default_val != null && default_val != undefined) {
+                if (!options.props[key])
+                    options.props[key] = {};
+                if(typeof default_val == 'function') options.props[key].type = Function;
+                if (typeof default_val == 'object') {
                     var copy = clone(default_val, false);
-                    default_val = function(){return clone(copy, false)}
+                    default_val = function () { return clone(copy, false); };
                 }
                 options.props[key].default = default_val;
-                delete options.data[key];
             }
+            delete options.data[key];
+            delete options.methods[key];
         }
 
         for( var i in newi.$$methodsToRemove){

lib/vuecomponent.js.map

@@ -29,6 +29,13 @@ describe('Prop', function(){
         option_prop:string
     }
 
+    @VueComponent
+    class FunctionPropTest {
+        @Prop defaultFunc(){
+            return 10;
+        }
+    }
+
     it('should have a simple prop', function(){
         var component = new PropTest();
         expect(component.$options['props']).to.have.property('simple_prop').that.has.property('default').that.equals('default val');
@@ -56,4 +63,11 @@ describe('Prop', function(){
         expect(o1()).to.not.equal(o2());
     })
 
+    it('should remove functrions from methods', function(){
+        var component = Utils.component('function-prop-test');
+        expect(component.$options.props).to.have.property('defaultFunc');
+        expect(component.$options.props.defaultFunc.default()).to.equal(10);
+        expect(component.$options.methods).not.to.have.property('defaultFunc');
+    })
+
 })