TraitExpression fix

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thilawyn/traitify-ts",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "type": "module",
   "publishConfig": {
     "registry": "https://git.jvalver.de/api/packages/thilawyn/npm/"
@@ -29,10 +29,12 @@
   },
   "dependencies": {
     "hotscript": "^1.0.13",
+    "lodash-es": "^4.17.21",
     "type-fest": "^4.10.2"
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^15.2.3",
+    "@types/lodash-es": "^4.17.12",
     "bun-types": "latest",
     "npm-check-updates": "^16.14.14",
     "npm-sort": "^0.0.4",

src/Trait.ts

@@ -1,157 +1,136 @@
-import { Fn, Pipe, Tuples } from "hotscript"
-import { AbstractClass, Class, Opaque } from "type-fest"
-import { TraitExpression, emptyTraitExpression } from "./TraitExpression"
-import { AbstractTag } from "./abstract"
-import { ExtendFn, SimplifyFn, StaticMembers, StaticMembersFn } from "./util"
-
-
-export type TraitApplierSuperTag = "@thilawyn/traitify-ts/TraitApplierSuper"
-
-
-export type AddAbstractToImplClass<
-    ImplClass extends Class<{}, []>,
-    Abstract  extends {},
-> = (
-    Class<
-        Abstract & InstanceType<ImplClass>,
-        ConstructorParameters<ImplClass>
-    > &
-    StaticMembers<ImplClass>
-)
-
-export type RemoveAbstractFromImplClass<
-    ImplClassWithAbstract extends Class<Abstract, []> & { _tag: TraitApplierSuperTag },
-    Abstract              extends {},
-> = (
-    Class<
-        Omit<InstanceType<ImplClassWithAbstract>, keyof Abstract>,
-        ConstructorParameters<ImplClassWithAbstract>
-    > &
-    Omit<StaticMembers<ImplClassWithAbstract>, "_tag">
-)
+import { AbstractClass, Class, Simplify } from "type-fest"
+import { TraitExpression } from "./TraitExpression"
+import { Extend, StaticMembers as StaticMembersUtil } from "./util"
 
 
 export class Trait<
-    Supertraits extends TraitExpression<typeof TraitExpression.NullSuperclass, Trait<any, any, any>[], Trait<any, any, any>[]>,
-    Abstract    extends {},
-    ImplClass   extends Class<{}, []>,
+    SuperExpression extends TraitExpression<
+        typeof TraitExpression.NullSuperclass,
+        Trait<any, any, any, any>[]
+    >,
+    Abstract        extends object,
+    StaticAbstract  extends object,
+    ImplClass       extends AbstractClass<object, []>,
 > {
     constructor(
-        readonly supertraits:  Supertraits,
-        readonly abstract:     Abstract,
-        readonly apply:        (Super: AbstractClass<{}>) => ImplClass,
+        readonly superExpression:  SuperExpression,
+        readonly abstract:         Abstract,
+        readonly staticAbstract:   StaticAbstract,
+        readonly apply:            (Super: AbstractClass<object>) => ImplClass,
     ) {}
 }
 
 export namespace Trait {
-    export type OwnSupertraits<T> = (
-        T extends Trait<infer Supertraits, any, any>
-            ? Supertraits
+    export type SuperExpression<T> = (
+        T extends Trait<infer SuperExpression, any, any, any>
+            ? SuperExpression
             : never
     )
-    export interface OwnSupertraitsFn extends Fn {
-        return: Trait.OwnSupertraits<this["arg0"]>
-    }
 
-    export type OwnAbstract<T> = (
-        T extends Trait<any, infer Abstract, any>
+    export type Supertraits<T> = (
+        TraitExpression.Traits<Trait.SuperExpression<T>>
+    )
+
+    export type Abstract<T> = (
+        T extends Trait<any, infer Abstract, any, any>
             ? Abstract
             : never
     )
-    export interface OwnAbstractFn extends Fn {
-        return: Trait.OwnAbstract<this["arg0"]>
-    }
 
-    export type OwnImplClass<T> = (
-        T extends Trait<any, any, infer ImplClass>
+    export type StaticAbstract<T> = (
+        T extends Trait<any, any, infer StaticAbstract, any>
+            ? StaticAbstract
+            : never
+    )
+
+    export type ImplClass<T> = (
+        T extends Trait<any, any, any, infer ImplClass>
             ? ImplClass
             : never
     )
-    export interface OwnImplClassFn extends Fn {
-        return: Trait.OwnImplClass<this["arg0"]>
-    }
 
-    export type OwnImplInstance<T> = (
-        T extends Trait<any, any, infer ImplClass>
-            ? InstanceType<ImplClass>
-            : never
+    export type ImplInstance<T> = (
+        InstanceType<Trait.ImplClass<T>>
     )
-    export interface OwnImplInstanceFn extends Fn {
-        return: Trait.OwnImplInstance<this["arg0"]>
-    }
 
-    export type OwnClass<T> = (
-        T extends Trait<any, infer Abstract, infer ImplClass>
-            ? AddAbstractToImplClass<ImplClass, Abstract>
-            : never
+    export type ImplStaticMembers<T> = (
+        StaticMembersUtil<Trait.ImplClass<T>>
     )
-    export interface OwnClassFn extends Fn {
-        return: Trait.OwnClass<this["arg0"]>
-    }
-
-    export type OwnInstance<T> = (
-        T extends Trait<any, infer Abstract, infer ImplClass>
-            ? InstanceType<
-                AddAbstractToImplClass<ImplClass, Abstract>
-            >
-            : never
-    )
-    export interface OwnInstanceFn extends Fn {
-        return: Trait.OwnInstance<this["arg0"]>
-    }
-
-    export type Supertraits<T> = (
-        T extends Trait<infer Supertraits, any, any>
-            ? TraitExpression.AllTraits<Supertraits>
-            : never
-    )
-    export interface SupertraitsFn extends Fn {
-        return: Trait.Supertraits<this["arg0"]>
-    }
-
-    export type Class<T> = (
-        AbstractClass<
-            Trait.Instance<T>,
-            any[]
-        > &
-        Pipe<T, [
-            Trait.SupertraitsFn,
-            Tuples.Append<T>,
-            Tuples.Map<Trait.OwnClassFn>,
-            Tuples.Map<StaticMembersFn>,
-            ExtendFn,
-            SimplifyFn,
-        ]>
-    )
-    export interface ClassFn extends Fn {
-        return: Trait.Class<this["arg0"]>
-    }
 
     export type Instance<T> = (
-        Pipe<T, [
-            Trait.SupertraitsFn,
-            Tuples.Append<T>,
-            Tuples.Map<Trait.OwnInstanceFn>,
-            ExtendFn,
-            SimplifyFn,
+        Extend<[
+            Trait.Abstract<T>,
+            Trait.ImplInstance<T>,
         ]>
     )
-    export interface InstanceFn extends Fn {
-        return: Trait.Instance<this["arg0"]>
+
+    export type StaticMembers<T> = (
+        Extend<[
+            Trait.StaticAbstract<T>,
+            Trait.ImplStaticMembers<T>,
+        ]>
+    )
+}
+
+export namespace TraitTuple {
+    export type MapAbstract<T> = {
+        [K in keyof T]: K extends keyof []
+            ? T[K]
+            : Trait.Abstract<T[K]>
+    }
+
+    export type MapStaticAbstract<T> = {
+        [K in keyof T]: K extends keyof []
+            ? T[K]
+            : Trait.StaticAbstract<T[K]>
+    }
+
+    export type MapImplClass<T> = {
+        [K in keyof T]: K extends keyof []
+            ? T[K]
+            : Trait.ImplClass<T[K]>
+    }
+
+    export type MapImplInstance<T> = {
+        [K in keyof T]: K extends keyof []
+            ? T[K]
+            : Trait.ImplInstance<T[K]>
+    }
+
+    export type MapImplStaticMembers<T> = {
+        [K in keyof T]: K extends keyof []
+            ? T[K]
+            : Trait.ImplStaticMembers<T[K]>
+    }
+
+    export type MapInstance<T> = {
+        [K in keyof T]: K extends keyof []
+            ? T[K]
+            : Trait.Instance<T[K]>
+    }
+
+    export type MapStaticMembers<T> = {
+        [K in keyof T]: K extends keyof []
+            ? T[K]
+            : Trait.StaticMembers<T[K]>
     }
 }
 
 
-export function trait<
-    Abstract              extends {},
-    ImplClassWithAbstract extends Class<Abstract, []> & { _tag: TraitApplierSuperTag },
->(
-    abstract:  Opaque<Abstract, AbstractTag>,
-    apply:     (Super: AbstractClass<Abstract> & { _tag: TraitApplierSuperTag }) => ImplClassWithAbstract,
-) {
-    return new Trait(
-        emptyTraitExpression,
-        abstract as Abstract,
-        apply    as any as (Super: AbstractClass<{}>) => RemoveAbstractFromImplClass<ImplClassWithAbstract, Abstract>,
-    )
-}
+export type TraitClass<T extends Trait<any, any, any, any>> = (
+    AbstractClass<TraitInstance<T>, any[]> &
+    TraitStaticMembers<T>
+)
+
+export type TraitConcreteClass<T extends Trait<any, any, any, any>> = (
+    Class<TraitInstance<T>, any[]> &
+    TraitStaticMembers<T>
+)
+
+export type TraitInstance<T extends Trait<any, any, any, any>> = (
+    Simplify<Trait.Instance<T>>
+)
+
+export type TraitStaticMembers<T extends Trait<any, any, any, any>> = (
+    Simplify<Trait.StaticMembers<T>>
+)

src/TraitBuilder.ts

@@ -0,0 +1,119 @@
+import { AbstractClass, Simplify } from "type-fest"
+import { Trait } from "./Trait"
+import { TraitExpression } from "./TraitExpression"
+import { Extend, StaticMembers } from "./util"
+
+
+type ImplSuper<This> = (
+    This extends TraitBuilder<
+        any,
+        infer Abstract,
+        infer StaticAbstract,
+        infer ImplClass
+    >
+        ? (
+            AbstractClass<
+                Simplify<
+                    Extend<[
+                        Abstract,
+                        InstanceType<ImplClass>,
+                    ]>
+                >
+            > &
+
+            Simplify<
+                Extend<[
+                    StaticAbstract,
+                    StaticMembers<ImplClass>,
+                ]>
+            > &
+            { readonly _tag: "@thilawyn/traitify-ts/Super" }  // TODO: replace with unique symbol?
+        )
+        : never
+)
+
+
+export class TraitBuilder<
+    SuperExpression extends TraitExpression<
+        typeof TraitExpression.NullSuperclass,
+        Trait<any, any, any, any>[]
+    >,
+    Abstract        extends object,
+    StaticAbstract  extends object,
+    ImplClass       extends AbstractClass<object, []>,
+> {
+    constructor(
+        private readonly traitSuperExpression:  SuperExpression,
+        private readonly traitAbstract:         Abstract,
+        private readonly traitStaticAbstract:   StaticAbstract,
+        private readonly traitApply:            (Super: AbstractClass<object>) => ImplClass,
+    ) {}
+
+    abstract<A extends Abstract>(
+        _: (Super: AbstractClass<Abstract>) => AbstractClass<A, []>
+    ) {
+        return new TraitBuilder(
+            this.traitSuperExpression,
+            {} as Simplify<A>,
+            this.traitStaticAbstract,
+            this.traitApply,
+        )
+    }
+
+    staticAbstract<A extends StaticAbstract>(
+        _: (Super: AbstractClass<StaticAbstract>) => AbstractClass<A, []>
+    ) {
+        return new TraitBuilder(
+            this.traitSuperExpression,
+            this.traitAbstract,
+            {} as Simplify<A>,
+            this.traitApply,
+        )
+    }
+
+    implement<
+        ImplClassWithAbstract extends ImplSuper<typeof this>
+    >(
+        apply: (Super: ImplSuper<typeof this>) => ImplClassWithAbstract
+    ) {
+        return new TraitBuilder(
+            this.traitSuperExpression,
+            this.traitAbstract,
+            this.traitStaticAbstract,
+
+            apply as unknown as (Super: AbstractClass<object>) => (
+                AbstractClass<
+                    Simplify<
+                        Omit<
+                            InstanceType<ImplClassWithAbstract>,
+                            keyof Abstract
+                        >
+                    >
+                > &
+
+                Simplify<
+                    Omit<
+                        StaticMembers<ImplClassWithAbstract>,
+                        keyof StaticAbstract | "_tag"
+                    >
+                >
+            ),
+        )
+    }
+
+    build() {
+        return new Trait(
+            this.traitSuperExpression,
+            this.traitAbstract,
+            this.traitStaticAbstract,
+            this.traitApply,
+        )
+    }
+}
+
+export const trait = new TraitBuilder(
+    new TraitExpression(TraitExpression.NullSuperclass, []),
+    {} as object,
+    {} as object,
+    Super => class extends Super {} as AbstractClass<object>,
+)

src/TraitExpression.ts

@@ -1,68 +1,74 @@
-import { Fn, Pipe, Tuples } from "hotscript"
-import { AbstractClass, Class, Opaque } from "type-fest"
-import { RemoveAbstractFromImplClass, Trait, TraitApplierSuperTag } from "./Trait"
-import { AbstractTag } from "./abstract"
-import { ExtendFn, SimplifyFn, StaticMembersFn } from "./util"
-
-
-// type RemoveSupertraitsAbstractFromAbstract<Left, Right> = {
-//     [Key in Extract<keyof Left, keyof Right>]: Left[Key]
-// } & {
-//     [Key in Exclude<keyof Left, keyof Right>]: Left[Key]
-// }
+import { AbstractClass, Class, Simplify } from "type-fest"
+import { Trait, TraitTuple } from "./Trait"
+import { TraitBuilder } from "./TraitBuilder"
+import { Extend, StaticMembers } from "./util"
 
 
 export class TraitExpression<
-    Superclass      extends AbstractClass<{}>,
-    const OwnTraits extends Trait<any, any, any>[],
-    const AllTraits extends Trait<any, any, any>[],
+    Superclass   extends AbstractClass<object>,
+    const Traits extends Trait<any, any, any, any>[],
 > {
     constructor(
         readonly superclass:  Superclass,
-        readonly ownTraits:   OwnTraits,
-        readonly allTraits:   AllTraits,
+        readonly traits:      Traits,
     ) {}
 
     get extends(): (
         AbstractClass<
-            Pipe<AllTraits, [
-                Tuples.Map<Trait.OwnImplInstanceFn>,       // Map all the traits to the instance of their implementation class
-                Tuples.Prepend<InstanceType<Superclass>>,  // Add the instance of the superclass at the top of the list
-                ExtendFn,                                  // Reduce to a single instance that extends all the instances in the list
-                SimplifyFn,                                // Make readable for IDEs
-            ]>,
+            InstanceType<Superclass> &  // Keep the instance of the superclass outside of any kind of type manipulation
+                                        // as it can accidentely remove abstract properties
+            Simplify<
+                Extend<
+                    TraitTuple.MapImplInstance<Traits>
+                >
+            >,
 
             ConstructorParameters<Superclass>
         > &
 
-        Pipe<AllTraits, [
-            Tuples.Map<Trait.OwnImplClassFn>,  // Map all the traits to their implementation class
-            Tuples.Prepend<Superclass>,        // Add the superclass at the top of the list
-            Tuples.Map<StaticMembersFn>,       // Map all the classes to an object containing their static members
-            ExtendFn,                          // Reduce to a single object that extends all the objects in the list
-            SimplifyFn,                        // Make readable for IDEs
-        ]>
+        Simplify<
+            Extend<[
+                StaticMembers<Superclass>,
+                ...TraitTuple.MapImplStaticMembers<Traits>,
+            ]>
+        >
     ) {
-        return this.allTraits.reduce(
+        return this.traits.reduce(
             (previous, trait) => trait.apply(previous),
             this.superclass,
         ) as any
     }
 
+    implementsStatic(target: ImplementsStatic<typeof this>, context: any) {}
+
     subtrait<
-        This                          extends TraitExpression<typeof TraitExpression.NullSuperclass, any, any>,
-        SubtraitAbstract              extends Implements<This>,
-        SubtraitImplClassWithAbstract extends Class<SubtraitAbstract, []> & { _tag: TraitApplierSuperTag },
+        This extends TraitExpression<typeof TraitExpression.NullSuperclass, any>
     >(
-        this:      This,
-        abstract:  (expression: This) => Opaque<SubtraitAbstract, AbstractTag>,
-        apply:     (Super: AbstractClass<SubtraitAbstract> & { _tag: TraitApplierSuperTag }) => SubtraitImplClassWithAbstract,
+        this: This
     ) {
-        return new Trait(
+        return new TraitBuilder<
+            This,
+
+            Simplify<
+                Extend<TraitTuple.MapAbstract<Traits>>
+            >,
+            Simplify<
+                Extend<TraitTuple.MapStaticAbstract<Traits>>
+            >,
+
+            AbstractClass<
+                Simplify<
+                    Extend<TraitTuple.MapImplInstance<Traits>>
+                >
+            > &
+            Simplify<
+                Extend<TraitTuple.MapImplStaticMembers<Traits>>
+            >
+        >(
             this,
-            // {} as RemoveSupertraitsAbstractFromAbstract<SubtraitAbstract, Implements<typeof this>>,
-            {} as SubtraitAbstract,  // TODO: find a way to cleanly substract Implements<typeof this> from this.
-            apply as any as (Super: AbstractClass<{}>) => RemoveAbstractFromImplClass<SubtraitImplClassWithAbstract, SubtraitAbstract>,
+            {} as any,
+            {} as any,
+            Super => class extends Super {} as any,
         )
     }
 }
@@ -70,44 +76,87 @@ export class TraitExpression<
 export namespace TraitExpression {
     export class NullSuperclass {
         static readonly _tag = "@thilawyn/traitify-ts/TraitExpression.NullSuperclass"
+        constructor(...args: any[]) {}
     }
 
     export type Superclass<T> = (
-        T extends TraitExpression<infer Superclass, any, any>
+        T extends TraitExpression<infer Superclass, any>
             ? Superclass
             : never
     )
-    export interface SuperclassFn extends Fn {
-        return: TraitExpression.Superclass<this["arg0"]>
-    }
 
-    export type OwnTraits<T> = (
-        T extends TraitExpression<any, infer OwnTraits, any>
-            ? OwnTraits
+    export type Traits<T> = (
+        T extends TraitExpression<any, infer Traits>
+            ? Traits
             : never
     )
-    export interface OwnTraitsFn extends Fn {
-        return: TraitExpression.OwnTraits<this["arg0"]>
-    }
-
-    export type AllTraits<T> = (
-        T extends TraitExpression<any, any, infer AllTraits>
-            ? AllTraits
-            : never
-    )
-    export interface AllTraitsFn extends Fn {
-        return: TraitExpression.AllTraits<this["arg0"]>
-    }
 }
 
-export const emptyTraitExpression = new TraitExpression(TraitExpression.NullSuperclass, [], [])
 
-
-export type Implements<Exp extends TraitExpression<any, any, any>> = (
-    Pipe<Exp, [
-        TraitExpression.AllTraitsFn,
-        Tuples.Map<Trait.OwnAbstractFn>,
-        ExtendFn,
-        SimplifyFn,
-    ]>
+export type Implements<
+    Exp extends TraitExpression<any, Trait<any, any, any, any>[]>
+> = (
+    Simplify<
+        Extend<
+            TraitTuple.MapAbstract<
+                TraitExpression.Traits<Exp>
+            >
+        >
+    >
+)
+
+export type ImplementsStatic<
+    Exp extends TraitExpression<any, Trait<any, any, any, any>[]>
+> = (
+    Simplify<
+        Extend<
+            TraitTuple.MapStaticAbstract<
+                TraitExpression.Traits<Exp>
+            >
+        >
+    >
+)
+
+
+export type TraitExpressionClass<
+    Exp extends TraitExpression<any, Trait<any, any, any, any>[]>
+> = (
+    AbstractClass<
+        TraitExpressionInstance<Exp>,
+        ConstructorParameters<TraitExpression.Superclass<Exp>>
+    > &
+    TraitExpressionStaticMembers<Exp>
+)
+
+export type TraitExpressionConcreteClass<
+    Exp extends TraitExpression<any, Trait<any, any, any, any>[]>
+> = (
+    Class<
+        TraitExpressionInstance<Exp>,
+        ConstructorParameters<TraitExpression.Superclass<Exp>>
+    > &
+    TraitExpressionStaticMembers<Exp>
+)
+
+export type TraitExpressionInstance<
+    Exp extends TraitExpression<any, Trait<any, any, any, any>[]>
+> = (
+    InstanceType<TraitExpression.Superclass<Exp>> &  // Keep the instance of the superclass outside of any kind of type manipulation
+                                                     // as it can accidentely remove abstract properties
+    Simplify<
+        Extend<
+            TraitTuple.MapInstance<TraitExpression.Traits<Exp>>
+        >
+    >
+)
+
+export type TraitExpressionStaticMembers<
+    Exp extends TraitExpression<any, Trait<any, any, any, any>[]>
+> = (
+    Simplify<
+        Extend<[
+            StaticMembers<TraitExpression.Superclass<Exp>>,
+            ...TraitTuple.MapStaticMembers<TraitExpression.Traits<Exp>>,
+        ]>
+    >
 )

src/TraitExpressionBuilder.ts

@@ -1,11 +1,12 @@
-import { Call, Fn, Pipe, Tuples } from "hotscript"
+import { Call, Fn, Tuples } from "hotscript"
+import { uniq } from "lodash-es"
 import { AbstractClass } from "type-fest"
-import { Trait } from "./Trait"
-import { TraitExpression, emptyTraitExpression } from "./TraitExpression"
-import { ExtendableFn, StaticMembersFn } from "./util"
+import { Trait, TraitTuple } from "./Trait"
+import { TraitExpression } from "./TraitExpression"
+import { Extendable, StaticMembers } from "./util"
 
 
-type SpreadSupertraits<Traits extends Trait<any, any, any>[]> = (
+type SpreadSupertraits<Traits extends Trait<any, any, any, any>[]> = (
     Call<
         Tuples.FlatMap<PrependTraitSupertraitsFn>,
         Traits
@@ -16,109 +17,92 @@ interface PrependTraitSupertraitsFn extends Fn {
 }
 
 
-type AbstractMembersExtendable<
-    Superclass extends AbstractClass<{}>,
-    Traits     extends Trait<any, any, any>[],
+type InstanceExtendable<
+    Superclass extends AbstractClass<object>,
+    Traits     extends Trait<any, any, any, any>[],
 > = (
-    Pipe<Traits, [
-        Tuples.Map<Trait.OwnAbstractFn>,
-        Tuples.Prepend<InstanceType<Superclass>>,
+    Extendable<[
+        InstanceType<Superclass>,
+        ...TraitTuple.MapInstance<Traits>,
     ]>
 )
 
-type ImplInstanceExtendable<
-    Superclass extends AbstractClass<{}>,
-    Traits     extends Trait<any, any, any>[],
+type StaticMembersExtendable<
+    Superclass extends AbstractClass<object>,
+    Traits     extends Trait<any, any, any, any>[],
 > = (
-    Pipe<Traits, [
-        Tuples.Map<Trait.OwnImplInstanceFn>,
-        Tuples.Prepend<InstanceType<Superclass>>,
-    ]>
-)
-
-type ImplStaticMembersExtendable<
-    Superclass extends AbstractClass<{}>,
-    Traits     extends Trait<any, any, any>[],
-> = (
-    Pipe<Traits, [
-        Tuples.Map<Trait.OwnImplClassFn>,
-        Tuples.Prepend<Superclass>,
-        Tuples.Map<StaticMembersFn>,
-        ExtendableFn,
+    Extendable<[
+        StaticMembers<Superclass>,
+        ...TraitTuple.MapStaticMembers<Traits>,
     ]>
 )
 
 type BuildTraitExpression<
-    Superclass extends AbstractClass<{}>,
-    OwnTraits  extends Trait<any, any, any>[],
-    AllTraits  extends Trait<any, any, any>[],
+    Superclass extends AbstractClass<object>,
+    Traits     extends Trait<any, any, any, any>[],
 > = (
-    AbstractMembersExtendable<Superclass, AllTraits> extends false
-        ? "Type conflict between the traits abstract members and/or the superclass instance."
-        : ImplInstanceExtendable<Superclass, AllTraits> extends false
-            ? "Type conflict between the traits implementation instances and/or the superclass instance."
-            : ImplStaticMembersExtendable<Superclass, AllTraits> extends false
-                ? "Type conflict between the traits implementation static members and/or the superclass static members."
-                : TraitExpression<Superclass, OwnTraits, AllTraits>
+    InstanceExtendable<Superclass, Traits> extends false
+        ? "Type conflict on the instance side."
+        : StaticMembersExtendable<Superclass, Traits> extends false
+            ? "Type conflict on the static side."
+            : TraitExpression<Superclass, Traits>
 )
 
 
 class TraitExpressionBuilder<
-    Superclass      extends AbstractClass<{}>,
-    const OwnTraits extends Trait<any, any, any>[],
-    const AllTraits extends Trait<any, any, any>[],
+    Superclass   extends AbstractClass<object>,
+    const Traits extends Trait<any, any, any, any>[],
 > {
-    constructor(private expression: TraitExpression<Superclass, OwnTraits, AllTraits>) {}
+    constructor(
+        private readonly expressionSuperclass:  Superclass,
+        private readonly expressionTraits:      Traits,
+    ) {}
 
     extends<
-        Super extends AbstractClass<any>
+        Super extends AbstractClass<object>
     >(
         superclass: Super
     ) {
         return new TraitExpressionBuilder(
-            new TraitExpression(
-                superclass,
-                this.expression.ownTraits,
-                this.expression.allTraits,
-            )
+            superclass,
+            this.expressionTraits,
         )
     }
 
     expresses<
-        const Traits extends Trait<any, any, any>[]
-    >(
-        ...traits: Traits
-    ): TraitExpressionBuilder<
-        Superclass,
-        [...OwnTraits, ...Traits],
-        [...AllTraits, ...SpreadSupertraits<Traits>]
-    > {
-        return new TraitExpressionBuilder(
-            new TraitExpression(
-                this.expression.superclass,
-                [...this.expression.ownTraits, ...traits],
-                [...this.expression.allTraits, ...this.spreadSupertraits(traits)],
-            )
-        )
-    }
-
-    private spreadSupertraits<
-        const Traits extends Trait<
-            TraitExpression<any, any, Trait<any, any, any>[]>,
+        const T extends Trait<
+            TraitExpression<
+                typeof TraitExpression.NullSuperclass,
+                Trait<any, any, any, any>[]
+            >,
+            any,
             any,
             any
         >[]
     >(
-        traits: Traits
-    ) {
-        return traits.flatMap(trait => [
-            ...trait.supertraits.allTraits,
-            trait,
-        ]) as SpreadSupertraits<Traits>
+        ...traits: T
+    ): TraitExpressionBuilder<
+        Superclass,
+        [...Traits, ...SpreadSupertraits<T>]
+    > {
+        return new TraitExpressionBuilder(
+            this.expressionSuperclass,
+
+            uniq([
+                ...this.expressionTraits,
+                ...traits.flatMap(trait => [
+                    ...trait.superExpression.traits,
+                    trait,
+                ]),
+            ]) as [...Traits, ...SpreadSupertraits<T>],
+        )
     }
 
     build() {
-        return this.expression as BuildTraitExpression<Superclass, OwnTraits, AllTraits>
+        return new TraitExpression(
+            this.expressionSuperclass,
+            this.expressionTraits,
+        ) as BuildTraitExpression<Superclass, Traits>
     }
 
     then<V>(fn: (expression: ReturnType<typeof this.build>) => V): V {
@@ -126,4 +110,4 @@ class TraitExpressionBuilder<
     }
 }
 
-export const expression = new TraitExpressionBuilder(emptyTraitExpression)
+export const expression = new TraitExpressionBuilder(TraitExpression.NullSuperclass, [])

src/abstract.ts

@@ -1,10 +0,0 @@
-import { Opaque } from "type-fest"
-
-
-export type AbstractTag = "@thilawyn/traitify-ts/Abstract"
-
-export function abstract<
-    Abstract extends {} = {}
->() {
-    return {} as Opaque<Abstract, AbstractTag>
-}

src/lib.ts

@@ -1,4 +1,4 @@
-export { trait, type Trait } from "./Trait"
-export { Implements, type TraitExpression } from "./TraitExpression"
+export { Trait, TraitClass, TraitConcreteClass, TraitInstance, TraitStaticMembers, TraitTuple } from "./Trait"
+export { TraitBuilder, trait } from "./TraitBuilder"
+export { Implements, ImplementsStatic, TraitExpression, TraitExpressionClass, TraitExpressionConcreteClass, TraitExpressionInstance, TraitExpressionStaticMembers } from "./TraitExpression"
 export { expression } from "./TraitExpressionBuilder"
-export { abstract } from "./abstract"

src/tests.ts

@@ -1,67 +1,63 @@
-import { Trait, trait } from "./Trait"
-import { Implements } from "./TraitExpression"
+import { AbstractClass, Simplify } from "type-fest"
+import { TraitClass } from "./Trait"
+import { trait } from "./TraitBuilder"
+import { Implements, ImplementsStatic, TraitExpressionClass } from "./TraitExpression"
 import { expression } from "./TraitExpressionBuilder"
-import { abstract } from "./abstract"
+import { Extendable, NonExtendableKeys } from "./util"
 
 
-const PrintsHelloOnNew = trait(
-    abstract(),
-    Super => class PrintsHelloOnNew extends Super {
+const PrintsHelloOnNew = trait
+    .implement(Super => class PrintsHelloOnNew extends Super {
         static readonly isPrintsHelloOnNew = true
 
         constructor(...args: any[]) {
             super(...args)
             console.log("Hello!")
         }
-    },
-)
-type PrintsHelloOnNewClass = Trait.Class<typeof PrintsHelloOnNew>
+    })
+    .build()
 
-const Identifiable = <ID>() => trait(
-    abstract<{ readonly id: ID }>(),
-    Super => class Identifiable extends Super {
+type PrintsHelloOnNewClass = TraitClass<typeof PrintsHelloOnNew>
+
+const Identifiable = <ID>() => trait
+    .abstract(Super => class extends Super {
+        declare readonly id: ID
+    })
+    .implement(Super => class Identifiable extends Super {
         equals(el: Identifiable) {
             return this.id === el.id
         }
-    },
-)
+    })
+    .build()
 
-const StatefulSubscription = trait(
-    abstract<{
-        readonly isStatefulSubscription: true
-        readonly status: (
+const StatefulSubscription = trait
+    .abstract(Super => class extends Super {
+        declare readonly isStatefulSubscription: true
+        declare readonly status: (
             { _tag: "awaitingPayment" } |
             { _tag: "active", activeSince: Date, expiresAt?: Date } |
             { _tag: "expired", expiredSince: Date }
         )
-    }>(),
+    })
+    .build()
 
-    Super => class StatefulSubscription extends Super {},
-)
-type StatefulSubscriptionClass = Trait.Class<typeof StatefulSubscription>
+type StatefulSubscriptionClass = TraitClass<typeof StatefulSubscription>
 
 const ActiveStatefulSubscription = expression
     .expresses(StatefulSubscription)
     .build()
-    .subtrait(
-        exp => {
-            interface IActiveStatefulSubscription extends Implements<typeof exp> {
-                readonly isActiveStatefulSubscription: true
-                readonly status: { _tag: "active", activeSince: Date, expiresAt?: Date }
-            }
-
-            return abstract<IActiveStatefulSubscription>()
-        },
-
-        Super => class ActiveStatefulSubscription extends Super {},
-    )
-
-type ActiveStatefulSubscriptionClass = Trait.Class<typeof ActiveStatefulSubscription>
+    .subtrait()
+        .abstract(Super => class extends Super {
+            declare readonly isActiveStatefulSubscription: true
+            declare readonly status: { _tag: "active", activeSince: Date, expiresAt?: Date }
+        })
+        .build()
 
+type ActiveStatefulSubscriptionClass = TraitClass<typeof ActiveStatefulSubscription>
 
 class TestSuperclass {
     // id: number = 69
-    // static test = 69
+    static test = 69
 }
 
 const exp = expression
@@ -75,7 +71,10 @@ const exp = expression
     .build()
 
 type Abs = Implements<typeof exp>
+type AbsStatic = ImplementsStatic<typeof exp>
+type ExpClass = TraitExpressionClass<typeof exp>
 
+@exp.implementsStatic
 class User extends exp.extends implements Implements<typeof exp> {
     readonly isStatefulSubscription: true = true
     readonly isActiveStatefulSubscription: true = true
@@ -84,3 +83,19 @@ class User extends exp.extends implements Implements<typeof exp> {
 }
 
 console.log(new User())
+
+
+abstract class Test {
+    abstract prout: string
+}
+
+const MappedTest = Test as AbstractClass<Test>
+
+class ConcreteTest extends MappedTest {
+
+}
+
+// type T = NonExtendableKeys<[
+//     { prout: "gneugneu" },
+//     { prout: string },
+// ]>

src/util/extend.ts

@@ -1,25 +1,70 @@
-import { Call, ComposeLeft, Fn, Match, Tuples } from "hotscript"
 import { CommonKeys } from "."
 
 
-type ExtendReducer<Super, Self> = (
-    Pick<Self, CommonKeys<Self, Super>> extends Pick<Super, CommonKeys<Self, Super>>
-        ? Omit<Super, CommonKeys<Self, Super>> & Self
-        : never
+// type ExtendReducer<Super, Self> = (
+//     Pick<Self, CommonKeys<Self, Super>> extends Pick<Super, CommonKeys<Self, Super>>
+//         ? Omit<Super, CommonKeys<Self, Super>> & Self
+//         : never
+// )
+// interface ExtendReducerFn extends Fn {
+//     return: ExtendReducer<this["arg0"], this["arg1"]>
+// }
+// export type ExtendFn = Tuples.Reduce<ExtendReducerFn, {}>
+
+// export type ExtendableFn = ComposeLeft<[
+//     ExtendFn,
+//     Match<[
+//         Match.With<never, false>,
+//         Match.With<any, true>,
+//     ]>
+// ]>
+
+
+export type Extend<T extends readonly object[]> = (
+    T extends [
+        infer Super,
+        infer Self,
+        ...infer Rest extends object[],
+    ]
+        ? Pick<Self, CommonKeys<Self, Super>> extends Pick<Super, CommonKeys<Self, Super>>
+            ? Extend<[
+                Omit<Super, CommonKeys<Self, Super>> & Self,
+                ...Rest,
+            ]>
+            : never
+        : T extends [infer Self]
+            ? Self
+            : {}
 )
-interface ExtendReducerFn extends Fn {
-    return: ExtendReducer<this["arg0"], this["arg1"]>
-}
 
-export type ExtendFn = Tuples.Reduce<ExtendReducerFn, {}>
-export type Extend<T extends {}[]> = Call<ExtendFn, T>
+export type Extendable<T extends readonly object[]> = (
+    T extends [
+        infer Super,
+        infer Self,
+        ...infer Rest extends object[],
+    ]
+        ? Pick<Self, CommonKeys<Self, Super>> extends Pick<Super, CommonKeys<Self, Super>>
+            ? Extendable<[
+                Omit<Super, CommonKeys<Self, Super>> & Self,
+                ...Rest,
+            ]>
+            : false
+        : true
+)
 
-
-export type ExtendableFn = ComposeLeft<[
-    ExtendFn,
-    Match<[
-        Match.With<never, false>,
-        Match.With<any, true>,
-    ]>
-]>
-export type Extendable<T extends {}[]> = Call<ExtendableFn, T>
+export type NonExtendableKeys<T extends readonly object[]> = (
+    T extends [
+        infer Super   extends object,
+        infer Self    extends object,
+        ...infer Rest extends object[],
+    ]
+        ? {[K in keyof Super & keyof Self]: Self[K] extends Super[K]
+            ? never
+            : K
+        }[keyof Super & keyof Self]
+        | NonExtendableKeys<[
+            Super & Self,
+            ...Rest,
+        ]>
+        : void
+)