From 77abffc8ff8f5c32811a446192b87f1341ec178b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Mon, 21 Jul 2025 21:55:19 +0200
Subject: [PATCH] Memo refactoring

---
 packages/effect-fc/src/Component.ts | 35 ++++++++++++++---------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/packages/effect-fc/src/Component.ts b/packages/effect-fc/src/Component.ts
index 280cad0..1052e49 100644
--- a/packages/effect-fc/src/Component.ts
+++ b/packages/effect-fc/src/Component.ts
@@ -340,28 +340,27 @@ export namespace Memoized {
     }
 }
 
-export const memo = <T extends Component<any, any, any>>(
-    self: ExcludeKeys<T, keyof Memoized<Component.Props<T>>>
-): T & Memoized<Component.Props<T>> => Object.setPrototypeOf(
-    { ...self, memo: true, memoOptions: {} },
-    Object.getPrototypeOf(self),
-)
+export const memo = <T extends Component<any, any, any> | Component<any, any, any> & Memoized<any>>(
+    self: T
+): T & Memoized<Component.Props<T>> => Object.setPrototypeOf({
+    ...self,
+    memo: true,
+    memoOptions: Predicate.hasProperty(self, "memo") ? { ...self.memoOptions } : {},
+}, Object.getPrototypeOf(self))
 
-export const memoWithOptions: {
-    <T extends Component<any, any, any>>(
+export const withMemoOptions: {
+    <T extends Component<any, any, any> & Memoized<any>>(
         memoOptions: Partial<Memoized.Options<Component.Props<T>>>
-    ): (
-        self: ExcludeKeys<T, keyof Memoized<Component.Props<T>>>
-    ) => T & Memoized<Component.Props<T>>
-    <T extends Component<any, any, any>>(
-        self: ExcludeKeys<T, keyof Memoized<Component.Props<T>>>,
+    ): (self: T) => T
+    <T extends Component<any, any, any> & Memoized<any>>(
+        self: T,
         memoOptions: Partial<Memoized.Options<Component.Props<T>>>,
-    ): T & Memoized<Component.Props<T>>
-} = Function.dual(2, <T extends Component<any, any, any>>(
-    self: ExcludeKeys<T, keyof Memoized<Component.Props<T>>>,
+    ): T
+} = Function.dual(2, <T extends Component<any, any, any> & Memoized<any>>(
+    self: T,
     memoOptions: Partial<Memoized.Options<Component.Props<T>>>,
-): T & Memoized<Component.Props<T>> => Object.setPrototypeOf(
-    { ...self, memo: true, memoOptions },
+): T => Object.setPrototypeOf(
+    { ...self, memoOptions: { ...self.memoOptions, ...memoOptions } },
     Object.getPrototypeOf(self),
 ))