Mutable

src/effect/schema/class/MutableClass.ts

@@ -1,17 +1,15 @@
 import { Schema as S } from "@effect/schema"
 import type { Annotations, Struct } from "@effect/schema/Schema"
 import type { TMutableClass } from "./TMutableClass"
-import type { HasFields, MissingSelfGeneric } from "./util"
+import type { HasFields } from "./util"
 
 
 export function MutableClass<Self = never>(identifier: string) {
     return <Fields extends Struct.Fields>(
         fieldsOr:      Fields | HasFields<Fields>,
         annotations?:  Annotations.Schema<Self>,
-    ): (
+    ) =>
-        [Self] extends [never]
+        S.Class<Self>(identifier)(fieldsOr, annotations) as TMutableClass<
-            ? MissingSelfGeneric<"Class">
-            : TMutableClass<
             Self,
             Fields,
             Struct.Encoded<Fields>,
@@ -20,6 +18,4 @@ export function MutableClass<Self = never>(identifier: string) {
             {},
             {}
         >
-    ) =>
-        S.Class<Self>(identifier)(fieldsOr, annotations)
 }

src/effect/schema/class/tests.ts

@@ -1,5 +1,18 @@
 import { Schema as S } from "@effect/schema"
 import { MutableClass } from "./MutableClass"
+import { pipe } from "remeda"
+import { Mutable } from "./Mutable"
+import { MobXObservable } from "./MobXObservable"
+
+
+const UserSuper = <Self>() => pipe(
+    MutableClass<Self>("User")({
+        id: S.BigIntFromSelf,
+        role: S.Union(S.Literal("BasicUser"), S.Literal("Admin")),
+    }),
+
+    v => MobXObservable(v),
+)
 
 
 class User extends MutableClass<User>("User")({