fix types

Author: ruojianll

src/class.ts

@@ -1,9 +1,13 @@
 import type { ComponentPublicInstance } from 'vue'
-import type { IdentityType, Identity, IdentitySymbol } from './identity'
+import type { IdentityType, Identity,IdentityAny, IdentitySymbol } from './identity'
 export type VueCons<RawInstance extends Identity = Identity, IT extends IdentityType = { props: {}, events: {} }, Bundle = IT['props'] & { [index in keyof IT['events']as `on${Capitalize<index & string>}`]?: IT['events'][index] extends Function ? IT['events'][index] : { (param: IT['events'][index]): any } }> = {
     new(): ComponentPublicInstance<Bundle> & Identity<IT> & Omit<RawInstance, typeof IdentitySymbol>
 }
 
+export type VueConsAny<RawInstance extends Identity = Identity, IT extends IdentityType = { props: {}, events: {} }, Bundle = IT['props'] & { [index in keyof IT['events']as `on${Capitalize<index & string>}`]?: IT['events'][index] extends Function ? IT['events'][index] : { (param: IT['events'][index]): any } }> = {
+    new(): ComponentPublicInstance<Bundle> & IdentityAny<IT> & Omit<RawInstance, typeof IdentitySymbol> & { [index: PropertyKey]: any }
+}
+
 export const Base = class {
 
 } as VueCons

src/identity.ts

@@ -8,10 +8,13 @@ export type IdentityType = {
 type AssertIs<O, T extends O> = T
 
 export interface Identity<T extends IdentityType = IdentityType> {
-    [index: PropertyKey]: any
     [IdentitySymbol]: T
 }
 
+export interface IdentityAny<T extends IdentityType = IdentityType> extends Identity<T> {
+    [index: PropertyKey]: any
+}
+
 type MergeRecord<N extends Record<string, any>, O extends Record<string, any>> = {
     [I in (keyof N) | (keyof O)]: I extends keyof N ? N[I] : I extends keyof O ? O[I] : never
 }

src/option/data.ts

@@ -1,8 +1,8 @@
-import type { VueCons } from '../class'
+import type { VueConsAny } from '../class'
 import type { OptionBuilder } from '../optionBuilder'
 import { filterNames, getValidOwnPropertyNames } from '../utils'
 import { obtainSlot } from '../slot'
-export function build(cons: VueCons, optionBuilder: OptionBuilder) {
+export function build(cons: VueConsAny, optionBuilder: OptionBuilder) {
     optionBuilder.data ??= {}
     const sample = new cons()
     let names = getValidOwnPropertyNames(sample, (des, name) => {

src/option/methodsAndHooks.ts

@@ -1,4 +1,4 @@
-import type { VueCons } from '../class'
+import type { VueConsAny } from '../class'
 import type { OptionBuilder } from '../optionBuilder'
 import { toComponentReverse, filterNames, getValidOwnPropertyNames, optionNullableMemberDecorator } from '../utils'
 import { obtainSlot } from '../slot'
@@ -29,7 +29,7 @@ export const decorator = optionNullableMemberDecorator(function (proto: any, nam
     map.set(name, null)
 })
 
-export function build(cons: VueCons, optionBuilder: OptionBuilder) {
+export function build(cons: VueConsAny, optionBuilder: OptionBuilder) {
     const slot = obtainSlot(cons.prototype)
     const protoArr = toComponentReverse(cons.prototype)
     const map = slot.obtainMap('hooks')

src/utils.ts

@@ -1,27 +1,27 @@
-import type { Identity } from './identity'
+import type { IdentityAny } from './identity'
 import { compatibleMemberDecorator, compatibleClassDecorator } from './deco3/utils';
 import { type VueCons, Base } from './class';
 import { getSlot, type Slot, type SlotMapNames } from './slot'
 
-export function getPrototypeOf(proto: Identity): Identity | null {
+export function getPrototypeOf(proto: IdentityAny): IdentityAny | null {
     const p = Object.getPrototypeOf(proto)
     if (!(p instanceof Base)) {
         return null
     }
     return p
 }
 
-export function toComponentReverse(proto: Identity) {
-    const arr: Identity[] = []
-    let curr: Identity | null = proto
+export function toComponentReverse(proto: IdentityAny) {
+    const arr: IdentityAny[] = []
+    let curr: IdentityAny | null = proto
     do {
         arr.unshift(curr)
         curr = getPrototypeOf(curr)
     } while (curr !== null && !getSlot(curr))
     return arr
 }
 
-export function getSuperSlot(proto: Identity) {
+export function getSuperSlot(proto: IdentityAny) {
     let curr = getPrototypeOf(proto)
 
     while (curr !== null) {
@@ -86,11 +86,11 @@ export function getProviderFunction(provide: any): () => {} {
 export function optionNullableMemberDecorator<T>(handler: { (proto: any, name: string, option?: T): any }) {
     function decorator(): any
     function decorator(option: T): any//option
-    function decorator(proto: Identity, name: any): any//deco stage 2
+    function decorator(proto: IdentityAny, name: any): any//deco stage 2
     function decorator(value: any, ctx: ClassMemberDecoratorContext): any //deco stage 3
-    function decorator(optionOrProtoOrValue?: T | Identity | any, nameOrCtx?: string | ClassMemberDecoratorContext): any {
+    function decorator(optionOrProtoOrValue?: T | IdentityAny | any, nameOrCtx?: string | ClassMemberDecoratorContext): any {
         if (nameOrCtx) {//no option
-            const protoOrValue = optionOrProtoOrValue as Identity | any
+            const protoOrValue = optionOrProtoOrValue as IdentityAny | any
             compatibleMemberDecorator(function (proto: any, name: any) {
                 handler(proto, name)
             })(protoOrValue, nameOrCtx)