tsx event type,2.1.1

Author: ruojianll

docs/en/tsx/attribute-types/attribute-types.md

@@ -10,7 +10,9 @@ To make enable TSX attribute types:
 
 4. Make component extend from `TSX<Props,Events>()(BaseComponent)`.
 
->   The keys of `Events` will be capitalized and prefixed by `on`. e.g. `myEvent` => `onMyEvent`.
+> The keys of `Events` will be capitalized and prefixed by `on`. e.g. `myEvent` => `onMyEvent`.
+
+> If a `Events` value has a non-function type, it's type will be transformed to a function that accepts only one parameter typed by the value's type and returns `any` type. e.g. `{myEvent:string}` => `{myEvent:(param:string)=>any}`.
 
 > There are two `()`s after `TSX<Props,Events>`.
 

docs/en/tsx/attribute-types/code-usage.tsx

@@ -6,6 +6,7 @@ interface Props {
 
 interface Events {
     myEvent: Function
+    myEvent2: string
 }
 
 @Component
@@ -18,9 +19,13 @@ export default class MyComponent extends TSX<Props, Events>()(Vue) {
     triggerMyEvent() {
         return 'event value'
     }
+    @Emit('myEvent2')
+    triggerMyEvent2() {
+        return 'event2 value'
+    }
 }
 
 //TypeScript will check component attributes in TSX.
 function render() {
-    return <MyComponent propString='foobar' onMyEvent={(v: string) => { }}></MyComponent>
+    return <MyComponent propString='foobar' onMyEvent={(v: string) => { }} onMyEvent2={(v:string)=>{}}></MyComponent>
 }

docs/zh-cn/tsx/attribute-types/attribute-types.md

@@ -12,6 +12,8 @@
 
 > `Events`中的键会变为首字母大写并被加前缀`on`，例如`myEvent` => `onMyEvent`。
 
+> 如果一个`Events`的值是非函数类型，它的类型会被转换为一个函数，这个函数仅仅接受一个前面定义值的类型的参数并且返回`any`类型。例如`{myEvent:string}` => `{myEvent:(param:string)=>any}`。
+
 > `TSX<Props,Events>`后有两个`()`。
 
 [](./code-usage.tsx ':include :type=code tsx')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-facing-decorator",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Vue typescript class and decorator based component.",
   "main": "dist/index.js",
   "keywords": [

src/index.ts

@@ -16,7 +16,7 @@ export interface BaseTypeIdentify {
 export function TSX<Properties extends {} = {}, Events extends {} = {}>() {
 
 
-    type Bundle = Properties & { [index in keyof Events as `on${Capitalize<index & string>}`]: Events[index] }
+    type Bundle = Properties & { [index in keyof Events as `on${Capitalize<index & string>}`]: Events[index] extends Function ? Events[index] : { (param: Events[index]): any } }
     return function <C extends { new(): ComponentPublicInstance & BaseTypeIdentify }>(cons: C) {
         return cons as unknown as {
             new(): Omit<ComponentPublicInstance<(InstanceType<C>['$props']) & Bundle>, keyof Bundle> & InstanceType<C>//& ComponentPublicInstance & BaseTypeIdentify

test/tsx/attributeTypes.ts

@@ -2,11 +2,12 @@ import { Component, TSX, Prop, Base } from '../../dist'
 interface Props {
     p: string
 }
-interface Events{
-    e:Function
+interface Events {
+    e: Function
+    e2: string
 }
 @Component
-class TsxAttributeTypes extends TSX<Props,Events>()(Base) implements Props {
+class TsxAttributeTypes extends TSX<Props, Events>()(Base) implements Props {
     @Prop({
         required: true
     })