From f028fb5a32ef3b5a38ec31d51087a2d64489ef2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Sat, 11 May 2024 01:45:17 +0200
Subject: [PATCH] Fix

---
 src/effect/EffectSchemaTraitExpressionBuilder.ts |  9 ---------
 src/effect/tests.ts                              | 15 +++++++++++----
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/effect/EffectSchemaTraitExpressionBuilder.ts b/src/effect/EffectSchemaTraitExpressionBuilder.ts
index f4b121a..8e8139f 100644
--- a/src/effect/EffectSchemaTraitExpressionBuilder.ts
+++ b/src/effect/EffectSchemaTraitExpressionBuilder.ts
@@ -55,15 +55,6 @@ export class EffectSchemaInitialTraitExpressionBuilder {
         annotations?:  S.Annotations.Schema<unknown>,
     ) {
         return new EffectSchemaTraitExpressionBuilder(
-            // superclass.extend<unknown>(identifier)(fields, annotations) as S.Class<
-            //     unknown,
-            //     Fields & NewFields,
-            //     I & S.Struct.Encoded<NewFields>,
-            //     R | S.Struct.Context<NewFields>,
-            //     C & S.Struct.Constructor<NewFields>,
-            //     InstanceType<Super>,
-            //     Proto
-            // >,
             superclass.extend<unknown>(identifier)(fields, annotations),
             {} as Omit<StaticMembers<Super>, keyof S.Class<Self, Fields, I, R, C, Inherited, Proto>>,
             [],
diff --git a/src/effect/tests.ts b/src/effect/tests.ts
index 70a786c..315bf07 100644
--- a/src/effect/tests.ts
+++ b/src/effect/tests.ts
@@ -4,6 +4,10 @@ import { EffectSchemaTraitExpression } from "./EffectSchemaTraitExpression"
 import { effectSchemaExpression } from "./EffectSchemaTraitExpressionBuilder"
 
 
+type RequiredKeys<T> = {
+    [K in keyof T]-?: {} extends Pick<T, K> ? never : K
+  }[keyof T]
+
 type Extr<T> =
     T extends EffectSchemaTraitExpression<
     infer Fields,
@@ -19,6 +23,10 @@ type Extr<T> =
         ? Static
         : never
 
+type InspectSchemaClass<T> = T extends S.Class<infer Self, infer Fields, infer I, infer R, infer C, infer Inherited, infer Proto>
+    ? C
+    : never
+
 
 const userExp = effectSchemaExpression
     .class("User", {
@@ -35,9 +43,11 @@ class User extends userExp.extends<User>() implements Implements<typeof userExp>
     static aStaticMethodThatShouldBeInherited() {}
 }
 
+type T1 = InspectSchemaClass<typeof userExp.superclass>
+type T2 = InstanceType<typeof userExp.superclass>
+
 const user = new User({ id: 0n, role: "User" })
 // user.id = 0n
-type UserEncoded = S.Schema.Encoded<typeof User>
 
 
 const adminExp = effectSchemaExpression
@@ -47,9 +57,6 @@ const adminExp = effectSchemaExpression
     // .immutable()
     .build()
 
-adminExp.superclass
-type T = Extr<typeof adminExp>
-
 @adminExp.staticImplements
 class Admin extends adminExp.extends<Admin>() implements Implements<typeof adminExp> {
 }