From 8252b6cbdf8ec37807e46f2cefc07c69f84cd7ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Fri, 21 Feb 2025 05:22:19 +0100
Subject: [PATCH] Extension work

---
 packages/reffuse/src/ReffuseExtension.ts | 28 +++++++++++++++++++-----
 packages/reffuse/src/types.ts            | 21 ++++++++++++++++++
 2 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 packages/reffuse/src/types.ts

diff --git a/packages/reffuse/src/ReffuseExtension.ts b/packages/reffuse/src/ReffuseExtension.ts
index 6d0648c..28987cb 100644
--- a/packages/reffuse/src/ReffuseExtension.ts
+++ b/packages/reffuse/src/ReffuseExtension.ts
@@ -1,10 +1,28 @@
-import type { Effect } from "effect"
-import * as ReffuseContext from "./ReffuseContext.js"
 import * as Reffuse from "./Reffuse.js"
-import type { Simplify } from "effect/Types"
+import type { Merge, StaticType } from "./types.js"
 
 
-const make = <T extends object>(extension: T) =>
-    <R extends typeof Reffuse.Reffuse>(base: R) => {
+const make = <Ext extends object>(extension: Ext) =>
+    <
+        BaseClass extends typeof Reffuse.Reffuse<R>,
+        R,
+    >(
+        base: BaseClass & typeof Reffuse.Reffuse<R>
+    ): (
+        { new(): Merge<InstanceType<BaseClass>, Ext> } &
+        StaticType<BaseClass>
+    ) => {
         const class_ = class extends base {}
+        return class_
     }
+
+
+const cls = make({
+    prout<R>(this: Reffuse.Reffuse<R>) {}
+})(Reffuse.Reffuse)
+
+class Cls extends cls {}
+
+const cls2 = make({
+    aya() {}
+})(cls)
diff --git a/packages/reffuse/src/types.ts b/packages/reffuse/src/types.ts
new file mode 100644
index 0000000..51f4129
--- /dev/null
+++ b/packages/reffuse/src/types.ts
@@ -0,0 +1,21 @@
+/**
+ * Extracts the common keys between two types
+ */
+export type CommonKeys<A, B> = Extract<keyof A, keyof B>
+
+/**
+ * Obtain the static members type of a constructor function type
+ */
+export type StaticType<T extends abstract new (...args: any) => any> = Omit<T, "prototype">
+
+export type Extend<Super, Self> =
+    Extendable<Super, Self> extends true
+        ? Omit<Super, CommonKeys<Self, Super>> & Self
+        : never
+
+export type Extendable<Super, Self> =
+    Pick<Self, CommonKeys<Self, Super>> extends Pick<Super, CommonKeys<Self, Super>>
+        ? true
+        : false
+
+export type Merge<Super, Self> = Omit<Super, CommonKeys<Self, Super>> & Self