0.1.0 (#1)

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

src/util/class.ts

@@ -1,66 +0,0 @@
-import { AbstractClass } from "type-fest"
-
-
-/**
- * Represents an array of instances corresponding to the provided classes.
- * @template Classes - An array of classes extending AbstractClass.
- */
-export type ClassesInstances<Classes extends readonly AbstractClass<any>[]> = (
-    Classes extends [infer Class, ...infer Rest]
-        ? Class extends AbstractClass<any>
-            ? Rest extends AbstractClass<any>[]
-                ? [InstanceType<Class>, ...ClassesInstances<Rest>]
-                : never
-            : never
-        : []
-)
-
-/**
- * Represents an intersection of instances of the provided classes.
- * @template Classes - An array of classes extending AbstractClass.
- */
-export type ClassesInstancesIntersection<Classes extends readonly AbstractClass<any>[]> = (
-    Classes extends [infer Class, ...infer Rest]
-        ? Class extends AbstractClass<any>
-            ? Rest extends AbstractClass<any>[]
-                ? InstanceType<Class> & ClassesInstancesIntersection<Rest>
-                : never
-            : never
-        : {}
-)
-
-/**
- * Represents the static members of a class.
- * @template Class - A class extending AbstractClass.
- */
-export type StaticMembers<Class extends AbstractClass<any>> = (
-    Omit<Class, "prototype">
-)
-
-/**
- * Represents an array of static members corresponding to the provided classes.
- * @template Classes - An array of classes extending AbstractClass.
- */
-export type ClassesStaticMembers<Classes extends readonly AbstractClass<any>[]> = (
-    Classes extends [infer Class, ...infer Rest]
-        ? Class extends AbstractClass<any>
-            ? Rest extends AbstractClass<any>[]
-                ? [StaticMembers<Class>, ...ClassesStaticMembers<Rest>]
-                : never
-            : never
-        : []
-)
-
-/**
- * Represents an intersection of static members of the provided classes.
- * @template Classes - An array of classes extending AbstractClass.
- */
-export type ClassesStaticMembersIntersection<Classes extends readonly AbstractClass<any>[]> = (
-    Classes extends [infer Class, ...infer Rest]
-        ? Class extends AbstractClass<any>
-            ? Rest extends AbstractClass<any>[]
-                ? StaticMembers<Class> & ClassesStaticMembersIntersection<Rest>
-                : never
-            : never
-        : {}
-)

src/util/extend.ts

@@ -0,0 +1,25 @@
+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
+)
+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 ExtendableFn = ComposeLeft<[
+    ExtendFn,
+    Match<[
+        Match.With<never, false>,
+        Match.With<any, true>,
+    ]>
+]>
+export type Extendable<T extends {}[]> = Call<ExtendableFn, T>

src/util/index.ts

@@ -1,3 +1,3 @@
-export * from "./class"
+export * from "./extend"
 export * from "./inheritance"
-export * from "./trait"
+export * from "./misc"

src/util/inheritance.ts

@@ -1,9 +1,5 @@
-/**
- * Represents the common keys between two types.
- * @template A - The first type.
- * @template B - The second type.
- */
-export type CommonKeys<A, B> = Extract<keyof A, keyof B>
+import { CommonKeys } from "."
+
 
 /**
  * Merges an inheritance tree defined by an array of types, considering overrides.

src/util/lib.ts

@@ -0,0 +1,6 @@
+export {
+    Extend,
+    ExtendFn,
+    Extendable,
+    ExtendableFn
+} from "."

src/util/misc.ts

@@ -0,0 +1,25 @@
+import { Fn } from "hotscript"
+import { AbstractClass, Simplify } from "type-fest"
+
+
+/**
+ * Represents the common keys between two types.
+ * @template A - The first type.
+ * @template B - The second type.
+ */
+export type CommonKeys<A, B> = Extract<keyof A, keyof B>
+
+export interface SimplifyFn extends Fn {
+    return: Simplify<this["arg0"]>
+}
+
+/**
+ * Represents the static members of a class.
+ * @template Class - A class extending AbstractClass.
+ */
+export type StaticMembers<Class extends AbstractClass<any>> = (
+    Omit<Class, "prototype">
+)
+export interface StaticMembersFn extends Fn {
+    return: StaticMembers<this["arg0"]>
+}

src/util/trait.ts

@@ -1,16 +0,0 @@
-import { Trait, TraitClass } from ".."
-
-
-/**
- * Represents an array of classes corresponding to the provided traits.
- * @template Traits - An array of traits extending Trait<any>.
- */
-export type TraitsClasses<Traits extends readonly Trait<any>[]> = (
-    Traits extends [infer T, ...infer Rest]
-        ? T extends Trait<any>
-            ? Rest extends Trait<any>[]
-                ? [TraitClass<T>, ...TraitsClasses<Rest>]
-                : never
-            : never
-        : []
-)