From 90b912f0293c0f366e2efc921d8d5c1aeb92ea83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=B6=E8=BF=9C=E6=96=B9?= <yangpanteng@gmail.com>
Date: Sat, 10 Jun 2023 21:27:10 +0800
Subject: [PATCH 1/2] refactor(reactivity): refactor computed setter type

---
 packages/reactivity/src/computed.ts | 28 ++++++++++++++++++----------
 packages/reactivity/src/effect.ts   |  2 +-
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/packages/reactivity/src/computed.ts b/packages/reactivity/src/computed.ts
index b24484c9e62..3b7d555b940 100644
--- a/packages/reactivity/src/computed.ts
+++ b/packages/reactivity/src/computed.ts
@@ -11,19 +11,23 @@ export interface ComputedRef<T = any> extends WritableComputedRef<T> {
   [ComputedRefSymbol]: true
 }
 
-export interface WritableComputedRef<T> extends Ref<T> {
+export interface WritableComputedRef<T, S = T> extends Ref<T> {
+  get value(): T
+  set value(newValue: S | T)
   readonly effect: ReactiveEffect<T>
 }
 
+//The return type of a 'get' accessor must be assignable to its 'set' accessor type
+
 export type ComputedGetter<T> = (...args: any[]) => T
 export type ComputedSetter<T> = (v: T) => void
 
-export interface WritableComputedOptions<T> {
+export interface WritableComputedOptions<T, S = T> {
   get: ComputedGetter<T>
-  set: ComputedSetter<T>
+  set: ComputedSetter<S>
 }
 
-export class ComputedRefImpl<T> {
+export class ComputedRefImpl<T, S = T> {
   public dep?: Dep = undefined
 
   private _value!: T
@@ -37,7 +41,7 @@ export class ComputedRefImpl<T> {
 
   constructor(
     getter: ComputedGetter<T>,
-    private readonly _setter: ComputedSetter<T>,
+    private readonly _setter: ComputedSetter<S>,
     isReadonly: boolean,
     isSSR: boolean
   ) {
@@ -60,10 +64,10 @@ export class ComputedRefImpl<T> {
       self._dirty = false
       self._value = self.effect.run()!
     }
-    return self._value
+    return self._value as any
   }
 
-  set value(newValue: T) {
+  set value(newValue: S) {
     this._setter(newValue)
   }
 }
@@ -109,13 +113,17 @@ export function computed<T>(
   options: WritableComputedOptions<T>,
   debugOptions?: DebuggerOptions
 ): WritableComputedRef<T>
-export function computed<T>(
-  getterOrOptions: ComputedGetter<T> | WritableComputedOptions<T>,
+export function computed<T, S>(
+  options: WritableComputedOptions<T, S>,
+  debugOptions?: DebuggerOptions
+): WritableComputedRef<T, S>
+export function computed<T, S>(
+  getterOrOptions: ComputedGetter<T> | WritableComputedOptions<T, S>,
   debugOptions?: DebuggerOptions,
   isSSR = false
 ) {
   let getter: ComputedGetter<T>
-  let setter: ComputedSetter<T>
+  let setter: ComputedSetter<S>
 
   const onlyGetter = isFunction(getterOrOptions)
   if (onlyGetter) {
diff --git a/packages/reactivity/src/effect.ts b/packages/reactivity/src/effect.ts
index d4a34edfef4..4ef045998dd 100644
--- a/packages/reactivity/src/effect.ts
+++ b/packages/reactivity/src/effect.ts
@@ -59,7 +59,7 @@ export class ReactiveEffect<T = any> {
    * Can be attached after creation
    * @internal
    */
-  computed?: ComputedRefImpl<T>
+  computed?: ComputedRefImpl<T, any>
   /**
    * @internal
    */

From f9f6b1ae1af33248e7f389b1633caeeeefb65dd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=B6=E8=BF=9C=E6=96=B9?= <yangpanteng@gmail.com>
Date: Sun, 11 Jun 2023 16:09:15 +0800
Subject: [PATCH 2/2] chore: update setter type

---
 packages/reactivity/src/computed.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/reactivity/src/computed.ts b/packages/reactivity/src/computed.ts
index 3b7d555b940..76064fa09f4 100644
--- a/packages/reactivity/src/computed.ts
+++ b/packages/reactivity/src/computed.ts
@@ -12,13 +12,12 @@ export interface ComputedRef<T = any> extends WritableComputedRef<T> {
 }
 
 export interface WritableComputedRef<T, S = T> extends Ref<T> {
+  // @ts-ignore
   get value(): T
-  set value(newValue: S | T)
+  set value(newValue: S)
   readonly effect: ReactiveEffect<T>
 }
 
-//The return type of a 'get' accessor must be assignable to its 'set' accessor type
-
 export type ComputedGetter<T> = (...args: any[]) => T
 export type ComputedSetter<T> = (v: T) => void