0.1.24 (#24)

Co-authored-by: Julien Valverdé <julien.valverde@mailo.com>
Reviewed-on: https://git.jvalver.de/Thilawyn/traitify-ts/pulls/24

src/TraitBuilder.ts

@@ -1,7 +1,7 @@
 import { AbstractConstructor, Constructor, Simplify } from "type-fest"
 import { Trait } from "./Trait"
 import { TraitExpression } from "./TraitExpression"
-import { Extend, StaticMembers } from "./util"
+import { Extend, StaticMembers, type } from "./util"
 
 
 declare const implSuperSymbol: unique symbol
@@ -24,8 +24,19 @@ export class TraitBuilder<
     ) {}
 
 
-    abstract<A extends Abstract>(
-        _: (Super: AbstractConstructor<Abstract>) => AbstractConstructor<A, []>
+    abstract<A extends AbstractConstructor<Abstract> & StaticAbstract>(
+        _: (Super: AbstractConstructor<Abstract> & StaticAbstract) => A
+    ) {
+        return new TraitBuilder(
+            this.traitSuperExpression,
+            {} as Simplify<InstanceType<A>>,
+            {} as Simplify<StaticMembers<A>>,
+            this.traitApply,
+        )
+    }
+
+    abstractType<A extends Abstract>(
+        _: (Super: Abstract) => typeof type<A>
     ) {
         return new TraitBuilder(
             this.traitSuperExpression,
@@ -35,8 +46,8 @@ export class TraitBuilder<
         )
     }
 
-    staticAbstract<A extends StaticAbstract>(
-        _: (Super: AbstractConstructor<StaticAbstract>) => AbstractConstructor<A, []>
+    staticAbstractType<A extends StaticAbstract>(
+        _: (Super: StaticAbstract) => typeof type<A>
     ) {
         return new TraitBuilder(
             this.traitSuperExpression,
@@ -163,7 +174,7 @@ export function implStaticInstantiableThis<
 
 export const trait = new TraitBuilder(
     new TraitExpression(TraitExpression.NullSuperclass, []),
-    {} as object,
-    {} as object,
-    Super => class extends Super {} as AbstractConstructor<object>,
+    {} as {},
+    {} as {},
+    Super => class extends Super {} as AbstractConstructor<{}>,
 )

src/TraitExpression.ts

@@ -142,7 +142,7 @@ export type TraitExpressionClass<
     TraitExpressionStaticMembers<Exp>
 )
 
-export type TraitExpressionConcreteClass<
+export type TraitExpressionInstantiableClass<
     Exp extends TraitExpressionLike<any, readonly Trait<any, any, any, any>[]>
 > = (
     Constructor<

src/effect/EffectSchemaTraitExpression.ts

@@ -32,17 +32,14 @@ implements TraitExpressionLike<
 
     extends<Self>(): (
         AbstractConstructor<
-            ApplyMutability<S.Struct.Type<Fields>, Mutability> &
-            Omit<
-                Simplify<
-                    Extend<[
-                        Inherited,
-                        ...TraitTuple.MapImplInstance<Traits>
-                    ]>
-                >,
-                keyof Fields
-            > &
-            Proto,
+            Simplify<
+                ApplyMutability<S.Struct.Type<Fields>, Mutability> &
+                Extend<[
+                    Omit<Inherited, keyof Fields>,
+                    ...TraitTuple.MapImplInstance<Traits>
+                ]> &
+                Proto
+            >,
 
             ConstructorParameters<S.Class<unknown, Fields, I, R, C, Inherited, Proto>>
         > &
@@ -57,7 +54,6 @@ implements TraitExpressionLike<
                 Proto
             >
         > &
-
         Simplify<
             Extend<[
                 Static,

src/lib.ts

@@ -1,4 +1,5 @@
 export { Trait, TraitClass, TraitConcreteClass, TraitInstance, TraitStaticMembers, TraitTuple } from "./Trait"
 export { ImplStatic, TraitBuilder, implStaticInstantiableThis, implStaticThis, trait } from "./TraitBuilder"
-export { Implements, StaticImplements, TraitExpression, TraitExpressionClass, TraitExpressionConcreteClass, TraitExpressionInstance, TraitExpressionStaticMembers } from "./TraitExpression"
+export { Implements, StaticImplements, TraitExpression, TraitExpressionClass, TraitExpressionInstance, TraitExpressionInstantiableClass, TraitExpressionStaticMembers } from "./TraitExpression"
 export { TraitExpressionBuilder, expression } from "./TraitExpressionBuilder"
+export { type } from "./util"

src/tests.ts

@@ -2,6 +2,7 @@ import { TraitClass } from "./Trait"
 import { trait } from "./TraitBuilder"
 import { Implements, StaticImplements, TraitExpressionClass } from "./TraitExpression"
 import { expression } from "./TraitExpressionBuilder"
+import { type } from "./util"
 
 
 const PrintsHelloOnNew = trait
@@ -18,9 +19,12 @@ const PrintsHelloOnNew = trait
 type PrintsHelloOnNewClass = TraitClass<typeof PrintsHelloOnNew>
 
 const Identifiable = <ID>() => trait
-    .abstract(Super => class extends Super {
-        declare readonly id: ID
-    })
+    // .abstract(Super => class extends Super {
+    //     declare readonly id: ID
+    // })
+    .abstractType(Super => type<typeof Super & {
+        readonly id: ID
+    }>)
     .implement(Super => class Identifiable extends Super {
         equals(el: Identifiable) {
             return this.id === el.id

src/util/misc.ts

@@ -12,6 +12,6 @@ export type CommonKeys<A, B> = Extract<keyof A, keyof B>
  * Represents the static members of a class.
  * @template Class - A class.
  */
-export type StaticMembers<Class extends AbstractConstructor<any>> = (
-    Omit<Class, "prototype">
-)
+export type StaticMembers<Class extends AbstractConstructor<any>> = Omit<Class, "prototype">
+
+export function type<T>() { return {} as T }