fix(core): unref setup returned dotValue correctly

Author: wangshunnn

inspect-extension/components/composition/computedRefDotValue/index-composition.mpx

@@ -0,0 +1,28 @@
+<template>
+  <view>
+    {{ mapResetInfo.source }}
+    {{ mapResetInfo1.trackAttrs.uid }}
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { computed } from '@mpxjs/core'
+import useMapDrag from './useMapDrag'
+
+const { mapResetInfo } = useMapDrag()
+
+const mapResetInfo1 = computed(() => {
+  return {
+    source: 'estimate',
+    statusType: 'success',
+    trackAttrs: {
+      uid: 1,
+    },
+  }
+})
+
+defineExpose({
+  mapResetInfo,
+  mapResetInfo1
+})
+</script>

inspect-extension/components/composition/computedRefDotValue/index-options.mpx

@@ -0,0 +1,34 @@
+<template>
+  <view>
+    {{ mapResetInfo.source }}
+    {{ mapResetInfo1.statusType}}
+  </view>
+</template>
+
+<script lang="ts">
+import { createPage, computed } from '@mpxjs/core'
+import useMapDrag from './useMapDrag'
+
+createPage({
+  setup(){
+    const { mapResetInfo } = useMapDrag()
+
+    const mapResetInfo1 = computed(() => {
+      return {
+        source: 'estimate',
+        statusType: 'success',
+        trackAttrs: {
+          uid: 1,
+        },
+      }
+    })
+
+    return {
+      mapResetInfo,
+      mapResetInfo1
+    }
+  },
+  computed: {
+  }
+})
+</script>

inspect-extension/components/composition/computedRefDotValue/useMapDrag.ts

@@ -0,0 +1,17 @@
+import { computed } from '@mpxjs/core'
+
+export default function useMapDrag() {
+  const mapResetInfo = computed(() => {
+    return {
+      source: 'estimate',
+      statusType: 'success',
+      trackAttrs: {
+        uid: 1,
+      },
+    }
+  })
+
+  return {
+    mapResetInfo,
+  }
+}

inspect-extension/components/composition/dotValue.mpx

@@ -0,0 +1,24 @@
+<template>
+  <view>
+    {{ msg.a }} - {{ count.b.value.a }} - {{ computedMsg.count }}
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref, computed } from '@mpxjs/core'
+
+const msg = ref({ a: 'default message' })
+const count = { b: ref({ a: 123 }) }
+const computedMsg = computed(() => {
+  return {
+    msg: msg.value.a,
+    count: count.b.value.a
+  }
+})
+
+defineExpose({
+  msg,
+  count,
+  computedMsg
+})
+</script>

inspect-extension/components/composition/refDotValue.mpx

@@ -1,5 +1,8 @@
 <template>
-  <view class="title"> title: {{ title }} </view>
+  <view class="title"> 
+    title: {{ title }}
+    titleRef: {{ titleRef }}
+  </view>
   <view wx:class="list" bindtap="onClick">
     <view> parentText: {{ parentText }} </view>
     <view> msg: {{ msg }} </view>
@@ -9,7 +12,7 @@
 </template>
 
 <script lang="ts">
-import { createComponent } from '@mpxjs/core'
+import { createComponent, ref } from '@mpxjs/core'
 
 createComponent({
   properties:{
@@ -26,10 +29,12 @@ createComponent({
       b: 2
     }
   },
-  setup() {
-    console.log('setup')
+  setup(props, context) {
+    console.log('setup', props.parentText)
+    context.triggerEvent('requestSuccess', {})
     return {
-      title: 'Mpx component'
+      title: 'Mpx component',
+      titleRef: ref('Mpx component'),
     }
   },
   computed: {
@@ -42,7 +47,7 @@ createComponent({
   },
   methods: {
     onClick() {
-      console.log('click', this.count, this.content)
+      console.log('click', this.titleRef, this.content)
       this.count++
     }
   },

inspect-extension/components/options/basic01.mpx

@@ -10,6 +10,7 @@ const globalTypes = `
     O extends AnyObject = {},
   >(
     opt: ThisTypedComponentOpt<D, P, C, M, Mi, S, O>,
+    config?: { customCtor: any }
   ): ComponentIns<D, P, C, M, Mi, S, O>
   // #endregion
 
@@ -23,6 +24,7 @@ const globalTypes = `
     O extends AnyObject = {},
   >(
     opt: ThisTypedPageOpt<D, P, C, M, Mi, O>,
+    config?: { customCtor: any }
   ): ComponentIns<D, P, C, M, Mi, O>
   // #endregion
 `
@@ -162,19 +164,14 @@ export type ComponentIns<
   UnboxMixinsField<Mi, 'data'> &
   M &
   UnboxMixinsField<Mi, 'methods'> & {
-    [K in keyof S]: S[K] extends Ref<infer V> ? V : S[K]
+    [K in keyof S]: S[K] extends import('@mpxjs/core').Ref<infer V> ? V : S[K]
   } & GetPropsType<P & UnboxMixinsField<Mi, 'properties'>> &
   GetComputedType<C & UnboxMixinsField<Mi, 'computed'>> &
   WxComponentIns<D, P, M> &
   MpxComponentIns &
   MpxComProps<O>
 type GetDataType<T> = T extends () => any ? ReturnType<T> : T
 type MpxComProps<O> = { $rawOptions: O }
-export interface Ref<T = any> {
-  value: T
-  [RefSymbol]: true
-}
-declare const RefSymbol: unique symbol
 export interface MpxComponentIns {
   [k: string]: any
 }

packages/language-core/src/codegen/globalTypes/defineComponentTypes.ts

@@ -156,7 +156,7 @@ export function generateGlobalTypes({
 	function __VLS_tryAsConstant<const T>(t: T): T;
 
 	type UnwrapRefs<T> = {
-		[K in keyof T]: T[K] extends { value: any }
+		[K in keyof T]: T[K] extends import('${lib}').Ref
 			? import('${lib}').UnwrapRef<T[K]>
 			: T[K]
 	}