type

Author: ruojianll

src/index.ts

@@ -10,10 +10,13 @@ import type {
     ComponentPublicInstance,
     ComponentOptions
 } from 'vue'
-
+const IdentifySymbol = Symbol('vue-facing-decorator-identify')
+export interface BaseTypeIdentify {
+    [IdentifySymbol]: undefined
+}
 
 export const Base = class { } as {
-    new(): ComponentPublicInstance
+    new(): ComponentPublicInstance & BaseTypeIdentify
 }
 
 

src/option/emit.ts

@@ -1,15 +1,12 @@
 import { Cons, OptionBuilder } from '../component'
-import { obtainSlot } from '../utils'
-import type { WatchCallback } from 'vue'
+import { obtainSlot, optoinNullableMemberDecorator } from '../utils'
 export type EmitConfig = null | string
-export function decorator(key?: string) {
+export const decorator = optoinNullableMemberDecorator(function (proto: any, name: string, key?: string) {
+    const slot = obtainSlot(proto)
+    let map = slot.obtainMap<Map<string, EmitConfig>>('emit');
+    map.set(name, typeof key === 'undefined' ? null : key)
+})
 
-    return function (proto: any, name: string) {
-        const slot = obtainSlot(proto)
-        let map = slot.obtainMap<Map<string, EmitConfig>>('emit');
-        map.set(name, typeof key === 'undefined' ? null : key)
-    }
-}
 
 export function build(cons: Cons, optionBuilder: OptionBuilder) {
     optionBuilder.methods ??= {}

src/option/inject.ts

@@ -1,19 +1,18 @@
 
 import { Cons, OptionBuilder } from '../component'
-import { obtainSlot } from '../utils'
+import { obtainSlot, optoinNullableMemberDecorator } from '../utils'
 export interface InjectConfig {
     from?: string | Symbol
     default?: any
 }
 
-export function decorator(option?: InjectConfig) {
-    return function (proto: any, name: string) {
-        const slot = obtainSlot(proto)
-        let map = slot.obtainMap<Map<string, InjectConfig>>('inject')
-        const opt = Object.assign({}, option ?? {})
-        map.set(name, opt)
-    }
-}
+export const decorator = optoinNullableMemberDecorator(function (proto: any, name: string, option?: InjectConfig) {
+    const slot = obtainSlot(proto)
+    let map = slot.obtainMap<Map<string, InjectConfig>>('inject')
+    const opt = Object.assign({}, option ?? {})
+    map.set(name, opt)
+})
+
 
 export function build(cons: Cons, optionBuilder: OptionBuilder) {
     optionBuilder.inject ??= {}

src/option/props.ts

@@ -1,22 +1,18 @@
 import { Cons, OptionBuilder } from '../component'
-import { obtainSlot } from '../utils'
+import { obtainSlot, optoinNullableMemberDecorator } from '../utils'
 export interface PropsConfig {
     type?: any
     required?: boolean
     default?: any
     validator?(value: any): boolean;
 }
 
-export function decorator(option?: PropsConfig) {
-
-    return function (proto: any, name: string) {
-        const slot = obtainSlot(proto)
-        let map = slot.obtainMap<Map<string, PropsConfig>>('props')
-        const opt = Object.assign({}, option ?? {})
-        map.set(name, opt)
-
-    }
-}
+export const decorator = optoinNullableMemberDecorator(function (proto: any, name: string, option?: PropsConfig) {
+    const slot = obtainSlot(proto)
+    let map = slot.obtainMap<Map<string, PropsConfig>>('props')
+    const opt = Object.assign({}, option ?? {})
+    map.set(name, opt as PropsConfig)
+})
 
 export function build(cons: Cons, optionBuilder: OptionBuilder) {
     optionBuilder.props ??= {}

src/option/ref.ts

@@ -1,10 +1,12 @@
 import { Cons, OptionBuilder } from '../component'
-import { obtainSlot } from '../utils'
-export function decorator(proto: any, name: string) {
+import { obtainSlot, optoinNullableMemberDecorator } from '../utils'
+
+export const decorator = optoinNullableMemberDecorator(function (proto: any, name: string, option?: {}) {
     const slot = obtainSlot(proto)
-    let map=slot.obtainMap<Map<string, any>>('ref')
+    let map = slot.obtainMap<Map<string, any>>('ref')
     map.set(name, true)
-}
+})
+
 
 export function build(cons: Cons, optionBuilder: OptionBuilder) {
     optionBuilder.computed ??= {}

src/option/watch.ts

@@ -1,5 +1,5 @@
 import { Cons, OptionBuilder } from '../component'
-import { obtainSlot } from '../utils'
+import { obtainSlot, } from '../utils'
 import type { WatchCallback } from 'vue'
 export interface WatchConfig {
     key: string
@@ -8,7 +8,8 @@ export interface WatchConfig {
     deep?: boolean,
     immediate?: boolean,
 }
-export function decorator(key: string, option?: Omit<WatchConfig, 'handler' | 'key'>) {
+type Option = Omit<WatchConfig, 'handler' | 'key'>
+export function decorator(key: string, option?: Option) {
 
     return function (proto: any, name: string) {
         const slot = obtainSlot(proto)

src/utils.ts

@@ -1,4 +1,5 @@
 import { Base } from './index'
+import type { BaseTypeIdentify } from './index'
 const SlotSymbol = Symbol('vue-facing-decorator-slot')
 class Slot {
     names: Map<string, Map<string, any>> = new Map
@@ -104,4 +105,21 @@ export function excludeNames(names: string[], slot: Slot) {
 export function getValidNames(obj: any, filter: (des: PropertyDescriptor, name: string) => boolean) {
     const descriptors = Object.getOwnPropertyDescriptors(obj)
     return Object.keys(descriptors).filter(name => filter(descriptors[name], name))
+}
+
+export function optoinNullableMemberDecorator<T>(handler: { (proto: any, name: string, option?: T): any }) {
+    function decorator(option?: T): any
+    function decorator(proto: BaseTypeIdentify, name: any): any
+    function decorator(optionOrProto?: T | BaseTypeIdentify, name?: any): any {
+        if (name) {
+            handler(optionOrProto, name)
+        }
+        else {
+            return function (proto: any, name: any) {
+                handler(proto, name, optionOrProto as T | undefined)
+            }
+        }
+    }
+
+    return decorator
 }

test/option/emit.ts

@@ -5,7 +5,7 @@ import { Component, Emit, Base } from '../../dist'
 
 @Component
 export class Comp extends Base {
-    @Emit()
+    @Emit
     defaultEmit() {
         return 'defaultEmit value'
     }

test/option/props.ts

@@ -8,7 +8,7 @@ function Full_validator() {
 }
 @Component
 export class Comp extends Base {
-    @Prop()
+    @Prop
     readonly propName!: any
 
     @Prop({