refactor: use TypeEl instead of TypeBlock

Author: zhiyuanzmj

packages-private/dts-test/defineVaporComponent.test-d.tsx

@@ -1040,8 +1040,8 @@ declare const MyButton: DefineVaporComponent<
   string,
   {},
   {},
-  {},
   Block,
+  {},
   true,
   Readonly<ExtractPropTypes<{}>>,
   VaporPublicProps & AllowedComponentProps & ComponentCustomProps,

packages/runtime-vapor/src/apiDefineComponent.ts

@@ -44,8 +44,8 @@ export type DefineVaporComponent<
   RuntimeEmitsKeys extends string = string,
   Slots extends StaticSlots = StaticSlots,
   Exposed extends Record<string, any> = Record<string, any>,
+  TypeBlock extends Block = Block,
   TypeRefs extends Record<string, unknown> = {},
-  TypeEl extends Block = Block,
   MakeDefaultsOptional extends boolean = true,
   InferredProps = string extends RuntimePropsKeys
     ? ComponentObjectPropsOptions extends RuntimePropsOptions
@@ -66,7 +66,7 @@ export type DefineVaporComponent<
     Emits,
     Slots,
     Exposed,
-    TypeEl,
+    TypeBlock,
     TypeRefs
   >
 > &
@@ -83,13 +83,13 @@ export type DefineVaporSetupFnComponent<
   Emits extends EmitsOptions = {},
   Slots extends SlotsType = SlotsType,
   Exposed extends Record<string, any> = Record<string, any>,
-  TypeEl extends Block = Block,
+  TypeBlock extends Block = Block,
   ResolvedProps extends Record<string, any> = Props &
     EmitsToProps<Emits> &
     VaporPublicProps,
 > = new (
   props?: ResolvedProps,
-) => VaporComponentInstance<ResolvedProps, Emits, Slots, Exposed, TypeEl>
+) => VaporComponentInstance<ResolvedProps, Emits, Slots, Exposed, TypeBlock>
 
 // overload 1: direct setup function
 // (uses user defined props interface)
@@ -99,7 +99,7 @@ export function defineVaporComponent<
   RuntimeEmitsKeys extends string = string,
   Slots extends StaticSlots = StaticSlots,
   Exposed extends Record<string, any> = Record<string, any>,
-  TypeEl extends Block = Block,
+  TypeBlock extends Block = Block,
 >(
   setup: (
     props: Props,
@@ -109,7 +109,7 @@ export function defineVaporComponent<
       attrs: Record<string, any>
       expose: (exposed: Exposed) => void
     },
-  ) => RenderReturn<TypeEl>,
+  ) => RenderReturn<TypeBlock>,
   extraOptions?: ObjectVaporComponent<
     (keyof Props)[],
     Emits,
@@ -118,14 +118,14 @@ export function defineVaporComponent<
     Exposed
   > &
     ThisType<void>,
-): DefineVaporSetupFnComponent<Props, Emits, Slots, Exposed, TypeEl>
+): DefineVaporSetupFnComponent<Props, Emits, Slots, Exposed, TypeBlock>
 export function defineVaporComponent<
   Props extends Record<string, any>,
   Emits extends EmitsOptions = {},
   RuntimeEmitsKeys extends string = string,
   Slots extends StaticSlots = StaticSlots,
   Exposed extends Record<string, any> = Record<string, any>,
-  TypeEl extends Block = Block,
+  TypeBlock extends Block = Block,
 >(
   setup: (
     props: Props,
@@ -135,7 +135,7 @@ export function defineVaporComponent<
       attrs: Record<string, any>
       expose: (exposed: Exposed) => void
     },
-  ) => RenderReturn<TypeEl>,
+  ) => RenderReturn<TypeBlock>,
   extraOptions?: ObjectVaporComponent<
     ComponentObjectPropsOptions<Props>,
     Emits,
@@ -144,7 +144,7 @@ export function defineVaporComponent<
     Exposed
   > &
     ThisType<void>,
-): DefineVaporSetupFnComponent<Props, Emits, Slots, Exposed, TypeEl>
+): DefineVaporSetupFnComponent<Props, Emits, Slots, Exposed, TypeBlock>
 
 // overload 2: defineVaporComponent with options object, infer props from options
 export function defineVaporComponent<
@@ -171,15 +171,15 @@ export function defineVaporComponent<
         : ExtractPropTypes<RuntimePropsOptions>
       : { [key in RuntimePropsKeys]?: any },
   TypeRefs extends Record<string, unknown> = {},
-  TypeEl extends Block = Block,
+  TypeBlock extends Block = Block,
 >(
   options: ObjectVaporComponent<
     RuntimePropsOptions | RuntimePropsKeys[],
     ResolvedEmits,
     RuntimeEmitsKeys,
     Slots,
     Exposed,
-    TypeEl,
+    TypeBlock,
     InferredProps
   > & {
     /**
@@ -197,7 +197,7 @@ export function defineVaporComponent<
     /**
      * @private for language-tools use only
      */
-    __typeEl?: TypeEl
+    __typeEl?: TypeBlock
   } & ThisType<void>,
 ): DefineVaporComponent<
   RuntimePropsOptions,
@@ -206,8 +206,8 @@ export function defineVaporComponent<
   RuntimeEmitsKeys,
   Slots,
   Exposed extends Block ? Record<string, any> : Exposed,
+  TypeBlock,
   TypeRefs,
-  TypeEl,
   // MakeDefaultsOptional - if TypeProps is provided, set to false to use
   // user props types verbatim
   unknown extends TypeProps ? true : false,

packages/runtime-vapor/src/component.ts

@@ -363,8 +363,8 @@ export class VaporComponentInstance<
   Emits extends EmitsOptions = {},
   Slots extends StaticSlots = StaticSlots,
   Exposed extends Record<string, any> = Record<string, any>,
-  TypeEl extends Block = Block,
-  Refs extends Record<string, any> = Record<string, any>,
+  TypeBlock extends Block = Block,
+  TypeRefs extends Record<string, any> = Record<string, any>,
 > implements GenericComponentInstance
 {
   vapor: true
@@ -374,7 +374,7 @@ export class VaporComponentInstance<
   parent: GenericComponentInstance | null
   appContext: GenericAppContext
 
-  block: TypeEl
+  block: TypeBlock
   scope: EffectScope
 
   rawProps: RawProps
@@ -400,7 +400,7 @@ export class VaporComponentInstance<
   exposeProxy: ShallowUnwrapRef<Exposed> | null
 
   // for useTemplateRef()
-  refs: Refs
+  refs: TypeRefs
   // for provide / inject
   provides: Record<string, any>
   // for useId
@@ -467,7 +467,7 @@ export class VaporComponentInstance<
 
     this.emit = emit.bind(null, this) as any
     this.expose = expose.bind(null, this) as any
-    this.refs = EMPTY_OBJ as Refs
+    this.refs = EMPTY_OBJ as TypeRefs
     this.emitted =
       this.exposed =
       this.exposeProxy =