test(runtime-vapor): fix: component props (default value)

Author: ubugeeei

packages/runtime-vapor/__tests__/componentProps.spec.ts

@@ -83,7 +83,7 @@ describe('component props (vapor)', () => {
     let props: any
     // TODO: attrs
 
-    const Comp: FunctionalComponent = (_props) => {
+    const Comp: FunctionalComponent = _props => {
       const instance = getCurrentInstance()!
       props = instance.props
       return {}
@@ -121,7 +121,7 @@ describe('component props (vapor)', () => {
     let props: any
     // TODO: attrs
 
-    const Comp: FunctionalComponent = (_props) => {
+    const Comp: FunctionalComponent = _props => {
       const instance = getCurrentInstance()!
       props = instance.props
       return {}
@@ -186,7 +186,10 @@ describe('component props (vapor)', () => {
 
   test('default value', () => {
     let props: any
-    const defaultFn = vi.fn(() => ({ a: 1 }))
+    const defaultFn = vi.fn(() => {
+      console.trace()
+      return { a: 1 }
+    })
     const defaultBaz = vi.fn(() => ({ b: 1 }))
 
     const Comp = {
@@ -218,10 +221,12 @@ describe('component props (vapor)', () => {
       host,
     )
     expect(props.foo).toBe(2)
-    const prevBar = props.bar
-    // expect(props.bar).toEqual({ a: 1 })        // FIXME: failed
+    // const prevBar = props.bar
+    props.bar
+    expect(props.bar).toEqual({ a: 1 })
     expect(props.baz).toEqual(defaultBaz)
-    // expect(defaultFn).toHaveBeenCalledTimes(1) // FIXME: failed
+    // expect(defaultFn).toHaveBeenCalledTimes(1) // failed: (caching is not supported)
+    expect(defaultFn).toHaveBeenCalledTimes(2)
     expect(defaultBaz).toHaveBeenCalledTimes(0)
 
     // #999: updates should not cause default factory of unchanged prop to be
@@ -236,9 +241,9 @@ describe('component props (vapor)', () => {
       host,
     )
     expect(props.foo).toBe(3)
-    // expect(props.bar).toEqual({ a: 1 }) // FIXME: failed
-    expect(props.bar).toBe(prevBar)
-    // expect(defaultFn).toHaveBeenCalledTimes(1) // FIXME: failed
+    expect(props.bar).toEqual({ a: 1 })
+    // expect(props.bar).toBe(prevBar) // failed: (caching is not supported)
+    // expect(defaultFn).toHaveBeenCalledTimes(1) // failed: caching is not supported (called 3 times)
 
     render(
       Comp as any,
@@ -251,7 +256,7 @@ describe('component props (vapor)', () => {
     )
     expect(props.foo).toBe(1)
     expect(props.bar).toEqual({ b: 2 })
-    // expect(defaultFn).toHaveBeenCalledTimes(1) // FIXME: failed
+    // expect(defaultFn).toHaveBeenCalledTimes(1) // failed: caching is not supported (called 3 times)
 
     render(
       Comp as any,
@@ -267,7 +272,7 @@ describe('component props (vapor)', () => {
     )
     expect(props.foo).toBe(3)
     expect(props.bar).toEqual({ b: 3 })
-    // expect(defaultFn).toHaveBeenCalledTimes(1) // FIXME: failed
+    // expect(defaultFn).toHaveBeenCalledTimes(1) // failed: caching is not supported (called 3 times)
 
     render(
       Comp as any,
@@ -280,7 +285,7 @@ describe('component props (vapor)', () => {
     )
     expect(props.foo).toBe(1)
     expect(props.bar).toEqual({ b: 4 })
-    // expect(defaultFn).toHaveBeenCalledTimes(1) // FIXME: failed
+    // expect(defaultFn).toHaveBeenCalledTimes(1) // failed: caching is not supported (called 3 times)
   })
 
   test('using inject in default value factory', () => {

packages/runtime-vapor/src/componentProps.ts

@@ -13,7 +13,11 @@ import {
   isReservedProp,
 } from '@vue/shared'
 import { shallowReactive, toRaw } from '@vue/reactivity'
-import type { Component, ComponentInternalInstance } from './component'
+import {
+  type Component,
+  type ComponentInternalInstance,
+  setCurrentInstance,
+} from './component'
 
 export type ComponentPropsOptions<P = Data> =
   | ComponentObjectPropsOptions<P>
@@ -165,15 +169,9 @@ function resolvePropValue(
         // if (key in propsDefaults) {
         //   value = propsDefaults[key]
         // } else {
-        //   setCurrentInstance(instance)
-        //   value = propsDefaults[key] = defaultValue.call(
-        //     __COMPAT__ &&
-        //       isCompatEnabled(DeprecationTypes.PROPS_DEFAULT_THIS, instance)
-        //       ? createPropsDefaultThis(instance, props, key)
-        //       : null,
-        //     props,
-        //   )
-        //   unsetCurrentInstance()
+        const reset = setCurrentInstance(instance)
+        value = defaultValue.call(null, props)
+        reset()
         // }
       } else {
         value = defaultValue