Refactoring

src/trait.ts

@@ -1,5 +1,5 @@
 import { AbstractClass, Class, UnionToIntersection } from "type-fest"
-import { StaticMembers, copyClassProperties, flattenClass } from "./util/class"
+import { StaticMembers, copyProperties, flattenClass, getInheritanceHierarchy } from "./util/class"
 
 
 export type Trait<T> =
@@ -40,7 +40,7 @@ export const extendAndApplyTraits = <
     traits:         Traits,
 ) =>
     traits.reduce((class_, trait) => {
-        copyClassProperties(flattenClass(trait), class_)
+        copyProperties(flattenClass(trait), class_)
         return class_
     }, class extends classToExtend {}) as (
         AbstractClass<
@@ -61,15 +61,25 @@ export const extendAndApplyTraits = <
     )
 
 
-export const mixTraits = <
+export function expresses<
     Traits extends readonly Trait<any>[]
 >(
     ...traits: Traits
-) =>
-    traits.reduce((class_, trait) => {
-        copyClassProperties(flattenClass(trait), class_)
-        return class_
-    }, class {}) as (
+) {
+    const class_ = class {}
+
+    traits.forEach(trait => {
+        getInheritanceHierarchy(trait).forEach(current => {
+            copyProperties(
+                current,
+                class_,
+                ["name", "length"],
+                ["constructor"],
+            )
+        })
+    })
+
+    return class_ as unknown as (
         Trait<
             UnionToIntersection<
                 InstanceType<
@@ -84,3 +94,4 @@ export const mixTraits = <
             >
         >
     )
+}