From 6fac7c7321a89a8fc89f695f5ca89444ed93e300 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Sun, 16 Jun 2024 04:12:28 +0200
Subject: [PATCH] Refactoring

---
 src/effect/schema/class/Class.ts              | 24 +++++------
 src/effect/schema/class/MutableClass.ts       | 24 +++++------
 src/effect/schema/class/MutableTaggedClass.ts | 42 ++++++++++++-------
 src/effect/schema/class/TaggedClass.ts        | 16 ++++---
 src/effect/schema/class/index.ts              |  1 +
 5 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/src/effect/schema/class/Class.ts b/src/effect/schema/class/Class.ts
index dcbba72..818e205 100644
--- a/src/effect/schema/class/Class.ts
+++ b/src/effect/schema/class/Class.ts
@@ -3,18 +3,16 @@ import type { Annotations, Struct } from "@effect/schema/Schema"
 import type { HasFields } from "./util"
 
 
-export function Class<Self>(identifier: string) {
-    return <Fields extends Struct.Fields>(
+export const Class = S.Class as <Self>(identifier: string) =>
+    <Fields extends Struct.Fields>(
         fieldsOr:      Fields | HasFields<Fields>,
         annotations?:  Annotations.Schema<Self>,
-    ) =>
-        S.Class<Self>(identifier)(fieldsOr, annotations) as S.Class<
-            Self,
-            Fields,
-            Struct.Encoded<Fields>,
-            Struct.Context<Fields>,
-            Struct.Constructor<Fields>,
-            {},
-            {}
-        >
-}
+    ) => S.Class<
+        Self,
+        Fields,
+        Struct.Encoded<Fields>,
+        Struct.Context<Fields>,
+        Struct.Constructor<Fields>,
+        {},
+        {}
+    >
diff --git a/src/effect/schema/class/MutableClass.ts b/src/effect/schema/class/MutableClass.ts
index 38c14b5..5040ba0 100644
--- a/src/effect/schema/class/MutableClass.ts
+++ b/src/effect/schema/class/MutableClass.ts
@@ -40,18 +40,16 @@ extends Omit<
 }
 
 
-export function MutableClass<Self>(identifier: string) {
-    return <Fields extends Struct.Fields>(
+export const MutableClass = S.Class as <Self>(identifier: string) =>
+    <Fields extends Struct.Fields>(
         fieldsOr:      Fields | HasFields<Fields>,
         annotations?:  Annotations.Schema<Self>,
-    ) =>
-        S.Class<Self>(identifier)(fieldsOr, annotations) as IMutableClass<
-            Self,
-            Fields,
-            Struct.Encoded<Fields>,
-            Struct.Context<Fields>,
-            Struct.Constructor<Fields>,
-            {},
-            {}
-        >
-}
+    ) => IMutableClass<
+        Self,
+        Fields,
+        Struct.Encoded<Fields>,
+        Struct.Context<Fields>,
+        Struct.Constructor<Fields>,
+        {},
+        {}
+    >
diff --git a/src/effect/schema/class/MutableTaggedClass.ts b/src/effect/schema/class/MutableTaggedClass.ts
index 428b303..b706616 100644
--- a/src/effect/schema/class/MutableTaggedClass.ts
+++ b/src/effect/schema/class/MutableTaggedClass.ts
@@ -1,26 +1,38 @@
 import { Schema as S } from "@effect/schema"
-import type { Annotations, Struct } from "@effect/schema/Schema"
+import type { Annotations, PropertySignature, Struct } from "@effect/schema/Schema"
 import type { IMutableClass } from "./MutableClass"
 import type { HasFields } from "./util"
 
 
-export function MutableTaggedClass<Self>(identifier?: string) {
-    return <
+export interface IMutableTaggedClass<
+    Self,
+    Tag,
+    Fields extends Struct.Fields,
+>
+extends IMutableClass<
+    Self,
+    Fields,
+    Struct.Encoded<Fields>,
+    Struct.Context<Fields>,
+    Struct.Constructor<Omit<Fields, "_tag">>,
+    {},
+    {}
+>
+{
+    readonly _tag: Tag
+}
+
+
+export const MutableTaggedClass = S.TaggedClass as <Self>(identifier?: string) =>
+    <
         Tag    extends string,
         Fields extends Struct.Fields,
     >(
         tag:           Tag,
         fieldsOr:      Fields | HasFields<Fields>,
         annotations?:  Annotations.Schema<Self>,
-    ) =>
-        S.TaggedClass<Self>(identifier)(tag, fieldsOr, annotations) as IMutableClass<
-            Self,
-            Fields,
-            Struct.Encoded<Fields>,
-            Struct.Context<Fields>,
-            Struct.Constructor<Omit<Fields, "_tag">>,
-            {},
-            {}
-        > &
-        { readonly _tag: Tag }
-}
+    ) => IMutableTaggedClass<
+        Self,
+        Tag,
+        { readonly _tag: PropertySignature<":", Tag, never, ":", Tag, true, never> } & Fields
+    >
diff --git a/src/effect/schema/class/TaggedClass.ts b/src/effect/schema/class/TaggedClass.ts
index 1619805..3d22786 100644
--- a/src/effect/schema/class/TaggedClass.ts
+++ b/src/effect/schema/class/TaggedClass.ts
@@ -3,18 +3,16 @@ import type { Annotations, PropertySignature, Struct } from "@effect/schema/Sche
 import type { HasFields } from "./util"
 
 
-export function TaggedClass<Self>(identifier?: string) {
-    return <
+export const TaggedClass = S.TaggedClass as <Self>(identifier?: string) =>
+    <
         Tag    extends string,
         Fields extends Struct.Fields,
     >(
         tag:           Tag,
         fieldsOr:      Fields | HasFields<Fields>,
         annotations?:  Annotations.Schema<Self>,
-    ) =>
-        S.TaggedClass<Self>(identifier)(tag, fieldsOr, annotations) as S.TaggedClass<
-            Self,
-            Tag,
-            { readonly _tag: PropertySignature<":", Tag, never, ":", Tag, true, never> } & Fields
-        >
-}
+    ) => S.TaggedClass<
+        Self,
+        Tag,
+        { readonly _tag: PropertySignature<":", Tag, never, ":", Tag, true, never> } & Fields
+    >
diff --git a/src/effect/schema/class/index.ts b/src/effect/schema/class/index.ts
index ae97e69..3bc9960 100644
--- a/src/effect/schema/class/index.ts
+++ b/src/effect/schema/class/index.ts
@@ -3,4 +3,5 @@ export { MobXObservable } from "./MobXObservable"
 export { MutableClass } from "./MutableClass"
 export type { IMutableClass } from "./MutableClass"
 export { MutableTaggedClass } from "./MutableTaggedClass"
+export type { IMutableTaggedClass } from "./MutableTaggedClass"
 export { TaggedClass } from "./TaggedClass"