Cleanup

src/TraitExpression.ts

@@ -1,4 +1,3 @@
-import { Schema as S } from "@effect/schema"
 import { AbstractClass, Class, Simplify } from "type-fest"
 import { Trait, TraitTuple } from "./Trait"
 import { TraitBuilder } from "./TraitBuilder"
@@ -39,38 +38,6 @@ export class TraitExpression<
         ) as any
     }
 
-    extendsEffectSchema<
-        Fields extends S.Struct.Fields,
-        A, I, R, C,
-        Inherited,
-        Proto,
-    >(
-        this: TraitExpression<
-            S.Class<void, Fields, A, I, R, C, Inherited, Proto>,
-            Traits
-        >
-    ) {
-        return <Self>(): (
-            AbstractClass<
-                InstanceType<
-                    S.Class<Self, Fields, A, I, R, C, Inherited, Proto>
-                > &
-                Simplify<
-                    Extend<TraitTuple.MapImplInstance<Traits>>
-                >,
-
-                ConstructorParameters<S.Class<Self, Fields, A, I, R, C, Inherited, Proto>>
-            > &
-
-            StaticMembers<
-                S.Class<Self, Fields, A, I, R, C, Inherited, Proto>
-            > &
-            Simplify<
-                Extend<TraitTuple.MapImplStaticMembers<Traits>>
-            >
-        ) => this.extends as any
-    }
-
 
     staticImplements(_target: StaticImplements<typeof this>, _context: any) {}
 
@@ -113,7 +80,7 @@ export namespace TraitExpression {
     const nullSuperclassSymbol = Symbol()
     export class NullSuperclass {
         static readonly [nullSuperclassSymbol]: true
-        constructor(...args: any[]) {}
+        constructor(..._args: any[]) {}
     }
 
     export type Superclass<T> = (

src/effect/extendsEffectSchemaExpression.ts

@@ -0,0 +1,40 @@
+import { Schema as S } from "@effect/schema"
+import { AbstractClass, Simplify } from "type-fest"
+import { Trait, TraitTuple } from "../Trait"
+import { TraitExpression } from "../TraitExpression"
+import { Extend, StaticMembers } from "../util"
+
+
+export function extendsEffectSchemaExpression<
+    Fields extends S.Struct.Fields,
+    A, I, R, C,
+    Inherited,
+    Proto,
+
+    const Traits extends readonly Trait<any, any, any, any>[],
+>(
+    expression: TraitExpression<
+        S.Class<void, Fields, A, I, R, C, Inherited, Proto>,
+        Traits
+    >
+) {
+    return <Self>(): (
+        AbstractClass<
+            InstanceType<
+                S.Class<Self, Fields, A, I, R, C, Inherited, Proto>
+            > &
+            Simplify<
+                Extend<TraitTuple.MapImplInstance<Traits>>
+            >,
+
+            ConstructorParameters<S.Class<Self, Fields, A, I, R, C, Inherited, Proto>>
+        > &
+
+        StaticMembers<
+            S.Class<Self, Fields, A, I, R, C, Inherited, Proto>
+        > &
+        Simplify<
+            Extend<TraitTuple.MapImplStaticMembers<Traits>>
+        >
+    ) => expression.extends as any
+}

src/effect/lib.ts

@@ -0,0 +1 @@
+export * from "./extendsEffectSchemaExpression"