chore: update

Author: zhiyuanzmj

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

@@ -611,15 +611,13 @@ describe('async setup', () => {
   })
 
   const vm = {} as InstanceType<typeof Comp>
-  if (vm.exposeProxy) {
-    // assert setup context unwrapping
-    expectType<number>(vm.exposeProxy.a)
-    expectType<string>(vm.exposeProxy.b.c.value)
-    expectType<GT>(vm.exposeProxy.d.e)
-
-    // setup context properties should be mutable
-    vm.exposeProxy.a = 2
-  }
+  // assert setup context unwrapping
+  expectType<number>(vm.exposeProxy.a)
+  expectType<string>(vm.exposeProxy.b.c.value)
+  expectType<GT>(vm.exposeProxy.d.e)
+
+  // setup context properties should be mutable
+  vm.exposeProxy.a = 2
 })
 
 // #5948
@@ -796,7 +794,7 @@ describe('function syntax w/ expose', () => {
     },
   )
   const foo = new Foo()
-  expectType<string>(foo.exposeProxy!.msg)
+  expectType<string>(foo.exposeProxy.msg)
 
   // runtime
   const Bar = defineVaporComponent(
@@ -808,7 +806,7 @@ describe('function syntax w/ expose', () => {
     },
   )
   const bar = new Bar()
-  expectType<string>(bar.exposeProxy!.msg)
+  expectType<string>(bar.exposeProxy.msg)
 })
 
 describe('function syntax w/ runtime props', () => {
@@ -1015,26 +1013,26 @@ describe('should work when props type is incompatible with setup returned type '
   expectType<
     VaporComponentInstance<{ size: SizeType }, {}, {}, { size: number }>
   >(CompA)
-  expectType<number>(CompA.exposeProxy!.size)
+  expectType<number>(CompA.exposeProxy.size)
   expectType<SizeType>(CompA.props.size)
 })
 
 describe('expose typing', () => {
   // types
-  const Foo = defineVaporComponent({
-    setup(
+  const Foo = defineVaporComponent(
+    (
       props: { some?: string },
       { expose }: { expose: (exposed: { a: number; b: string }) => void },
-    ) {
+    ) => {
       expose({ a: 1, b: '' })
     },
-  })
+  )
   const foo = new Foo()
   // internal should still be exposed
   foo.props
 
-  expectType<number>(foo.exposeProxy!.a)
-  expectType<string>(foo.exposeProxy!.b)
+  expectType<number>(foo.exposeProxy.a)
+  expectType<string>(foo.exposeProxy.b)
 
   // runtime
   const Bar = defineVaporComponent({
@@ -1050,8 +1048,8 @@ describe('expose typing', () => {
   // internal should still be exposed
   bar.props
 
-  expectType<number>(bar.exposeProxy!.a)
-  expectType<string>(bar.exposeProxy!.b)
+  expectType<number>(bar.exposeProxy.a)
+  expectType<string>(bar.exposeProxy.b)
 })
 
 // code generated by tsc / vue-tsc, make sure this continues to work

packages/runtime-vapor/src/apiDefineComponent.ts

@@ -114,7 +114,7 @@ export function defineVaporComponent<
       attrs: Record<string, any>
       expose: (exposed: Exposed) => void
     },
-  ) => RenderReturn<TypeBlock>,
+  ) => RenderReturn<TypeBlock> | void,
   extraOptions?: ObjectVaporComponent<
     (keyof Props)[],
     Emits,
@@ -140,7 +140,7 @@ export function defineVaporComponent<
       attrs: Record<string, any>
       expose: (exposed: Exposed) => void
     },
-  ) => RenderReturn<TypeBlock>,
+  ) => RenderReturn<TypeBlock> | void,
   extraOptions?: ObjectVaporComponent<
     ComponentObjectPropsOptions<Props>,
     Emits,

packages/runtime-vapor/src/component.ts

@@ -119,7 +119,7 @@ export interface ObjectVaporComponent<
     emit: EmitFn<Emits>,
     attrs: any,
     slots: Slots,
-  ): RenderReturn<TypeBlock>
+  ): RenderReturn<TypeBlock> | void
 
   name?: string
   vapor?: boolean
@@ -397,8 +397,10 @@ export class VaporComponentInstance<
   expose: (<T extends Record<string, any> = Exposed>(exposed: T) => void) &
     // compatible with vdom components
     string[]
-  exposed: Exposed | null
-  exposeProxy: ShallowUnwrapRef<Exposed> | null
+  exposed: Record<string, any> extends Exposed ? Exposed | null : Exposed
+  exposeProxy: Record<string, any> extends Exposed
+    ? Exposed | null
+    : ShallowUnwrapRef<Exposed>
 
   // for useTemplateRef()
   refs: TypeRefs
@@ -474,7 +476,7 @@ export class VaporComponentInstance<
       this.exposeProxy =
       this.propsDefaults =
       this.suspense =
-        null
+        null as any
 
     this.isMounted =
       this.isUnmounted =