fix: 修复当使用markRaw时类型推导出错的问题

Author: zhangfisher

packages/core/__tests__/reactive.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, expect, vi, test } from 'vitest';
+import { describe,  expect, test } from 'vitest';
 import { AutoStore, isRaw,markRaw } from '../src';
 
 // 测试 isEventMatched 函数
@@ -8,12 +8,15 @@ describe("reactive",()=>{
             a:1,
             b:2,
             c:3,
+            total:async ()=>store.state.a+store.state.b+store.state.c,
             x:markRaw({
+                total:async ()=>store.state.a+store.state.b+store.state.c,
                 x1:1,
                 x2:2,
                 x3:{
                     x31:1,
-                    x32:2
+                    x32:2,
+                    x33: ()=>1
                 }
             })
         })
@@ -26,5 +29,8 @@ describe("reactive",()=>{
         store.state.x.x2        
         store.state.x.x3.x31
         store.state.x.x3.x32
+        store.state.x.x3.x33
+        store.state.x.total
+        store.state.total
     })
 })

packages/core/src/types.ts

@@ -1,5 +1,6 @@
 import { AsyncComputedDescriptorBuilder, AsyncComputedGetter, AsyncComputedValue, ComputedGetter, SyncComputedDescriptorBuilder } from "./computed";
 import type  { AutoStore } from "./store";
+import { RawObject } from "./utils";
 import { WatchDescriptorBuilder } from "./watch/types";
 import { Get,Paths} from "type-fest"
 
@@ -31,21 +32,23 @@ export type PickComputedResult<T> = T extends AsyncComputedDescriptorBuilder<inf
 
 
 export type ComputedState<T> = T extends unknown[] ? ComputedState<T[number]>[] 
-    : ( 
-        T extends (...args:any) => any ? PickComputedResult<T> 
+    : 
+        T extends RawObject<T> ? T 
         : (
-            T extends Dict  ? {
-                [K in keyof T]: T[K] extends (...args:any[]) => any ? PickComputedResult<T[K]> 
-                    : (  
-                        T[K] extends Record<string, any> ? ComputedState<T[K]> 
-                        :   ( 
-                                T[K] extends unknown[] ? ComputedState<T[K][number]>[] : T[K]
-                            )
-                        )        
-                }  
-            : T
-        )
-        
+            T extends (...args:any) => any ? PickComputedResult<T> 
+            : (
+                T extends Dict  ? {
+                    [K in keyof T]: T[K] extends (...args:any[]) => any ? PickComputedResult<T[K]> 
+                        : (  
+                            T[K] extends Record<string, any> ? ComputedState<T[K]> 
+                            :   ( 
+                                    T[K] extends unknown[] ? ComputedState<T[K][number]>[] : T[K]
+                                )
+                            )        
+                    }  
+                : T
+            )
+        )        
     )
 
 // export type ComputedStateBak<T extends Record<string, any>> = {

packages/core/src/utils/markRaw.ts

@@ -1,15 +1,19 @@
 import { SKIP_PROXY_FLAG } from "../consts";
 
+export type RawObject<T> = T & {
+    [SKIP_PROXY_FLAG]: true
+}
 
 /**
  * 标记一个对象为非响应式，不创建响应式代理
  * 
  * @param obj 
  * @returns 
  */
-export function markRaw(obj: any) {
+export function markRaw<T=any>(obj: T):RawObject<T>{
     try{ 
+        // @ts-ignore
         obj[SKIP_PROXY_FLAG] = true
     }catch{}
-    return obj;
+    return obj as RawObject<T>
 }