chore: add null for exposedProxy

Author: zhiyuanzmj

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

@@ -611,13 +611,15 @@ describe('async setup', () => {
   })
 
   const vm = {} as InstanceType<typeof Comp>
-  // 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
+  if (vm.exposed && 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.exposed.a.value = 2
+  }
 })
 
 // #5948
@@ -794,7 +796,7 @@ describe('function syntax w/ expose', () => {
     },
   )
   const foo = new Foo()
-  expectType<string>(foo.exposeProxy.msg)
+  expectType<string>(foo.exposeProxy!.msg)
 
   // runtime
   const Bar = defineVaporComponent(
@@ -806,7 +808,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', () => {
@@ -1013,7 +1015,7 @@ 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)
 })
 
@@ -1031,8 +1033,8 @@ describe('expose typing', () => {
   // 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({
@@ -1048,8 +1050,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/component.ts

@@ -397,10 +397,8 @@ export class VaporComponentInstance<
   expose: (<T extends Record<string, any> = Exposed>(exposed: T) => void) &
     // compatible with vdom components
     string[]
-  exposed: Record<string, any> extends Exposed ? Exposed | null : Exposed
-  exposeProxy: Record<string, any> extends Exposed
-    ? Exposed | null
-    : ShallowUnwrapRef<Exposed>
+  exposed: Exposed | null
+  exposeProxy: ShallowUnwrapRef<Exposed> | null
 
   // for useTemplateRef()
   refs: TypeRefs
@@ -476,7 +474,7 @@ export class VaporComponentInstance<
       this.exposeProxy =
       this.propsDefaults =
       this.suspense =
-        null as any
+        null
 
     this.isMounted =
       this.isUnmounted =