From 4272b71d4a6a920ab5f6f7f007c86f2b50f35627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Sun, 17 Mar 2024 11:14:05 +0100
Subject: [PATCH 1/3] Tests

---
 src/tests.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/tests.ts b/src/tests.ts
index af9b93f..7d7278c 100644
--- a/src/tests.ts
+++ b/src/tests.ts
@@ -28,6 +28,15 @@ const Identifiable = <ID>() => trait
     })
     .build()
 
+const ImplementsIdentifiable = <ID>(defaultID: ID) => expression
+    .expresses(Identifiable<ID>())
+    .build()
+    .subtrait()
+        .implement(Super => class ImplementsIdentifiable extends Super {
+            readonly id = defaultID
+        })
+        .build()
+
 const StatefulSubscription = trait
     .abstract(Super => class extends Super {
         declare readonly isStatefulSubscription: true
-- 
2.49.1


From 049336fb572c01fb68997a211295b81884a3d114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Fri, 22 Mar 2024 22:43:47 +0100
Subject: [PATCH 2/3] implStaticThis

---
 src/TraitBuilder.ts | 36 +++++++++++++++++++++++++++++++++++-
 src/lib.ts          |  2 +-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/TraitBuilder.ts b/src/TraitBuilder.ts
index a01f933..76a7b60 100644
--- a/src/TraitBuilder.ts
+++ b/src/TraitBuilder.ts
@@ -1,4 +1,4 @@
-import { AbstractClass, Simplify } from "type-fest"
+import { AbstractClass, Class, Simplify } from "type-fest"
 import { Trait } from "./Trait"
 import { TraitExpression } from "./TraitExpression"
 import { Extend, StaticMembers } from "./util"
@@ -128,6 +128,40 @@ export type ImplStatic<
     >
 )
 
+export function implStaticThis<
+    ImplClass extends AbstractClass<object> & { readonly [implSuperSymbol]: true },
+    This      extends AbstractClass<object>,
+>(
+    _Impl:    ImplClass,
+    thisArg:  This,
+) {
+    return thisArg as unknown as (
+        AbstractClass<
+            InstanceType<ImplClass> & InstanceType<This>,
+            ConstructorParameters<This>
+        > &
+        ImplStatic<ImplClass> &
+        StaticMembers<This>
+    )
+}
+
+export function implStaticInstantiableThis<
+    ImplClass extends AbstractClass<object> & { readonly [implSuperSymbol]: true },
+    This      extends Class<object>,
+>(
+    _Impl:    ImplClass,
+    thisArg:  This,
+) {
+    return thisArg as unknown as (
+        Class<
+            InstanceType<ImplClass> & InstanceType<This>,
+            ConstructorParameters<This>
+        > &
+        ImplStatic<ImplClass> &
+        StaticMembers<This>
+    )
+}
+
 
 export const trait = new TraitBuilder(
     new TraitExpression(TraitExpression.NullSuperclass, []),
diff --git a/src/lib.ts b/src/lib.ts
index 3e9f23b..a96aa6a 100644
--- a/src/lib.ts
+++ b/src/lib.ts
@@ -1,4 +1,4 @@
 export { Trait, TraitClass, TraitConcreteClass, TraitInstance, TraitStaticMembers, TraitTuple } from "./Trait"
-export { ImplStatic, TraitBuilder, trait } from "./TraitBuilder"
+export { ImplStatic, TraitBuilder, implStaticInstantiableThis, implStaticThis, trait } from "./TraitBuilder"
 export { Implements, StaticImplements, TraitExpression, TraitExpressionClass, TraitExpressionConcreteClass, TraitExpressionInstance, TraitExpressionStaticMembers } from "./TraitExpression"
 export { TraitExpressionBuilder, expression } from "./TraitExpressionBuilder"
-- 
2.49.1


From 41c3fb649afbafa82070d12346a34b3a7f37668a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Sat, 23 Mar 2024 00:47:12 +0100
Subject: [PATCH 3/3] Upgraded dependencies

---
 bun.lockb    | Bin 156807 -> 156807 bytes
 package.json |  10 +++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bun.lockb b/bun.lockb
index f44c7202706d479fd5424ab987a2c25f29a6810d..77b93b10dbc7b9f75b4bd7f3ddfb964222b840cc 100755
GIT binary patch
delta 2150
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

delta 2132
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

diff --git a/package.json b/package.json
index ce1af94..6cd1b12 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@thilawyn/traitify-ts",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "type": "module",
   "publishConfig": {
     "registry": "https://git.jvalver.de/api/packages/thilawyn/npm/"
@@ -29,18 +29,18 @@
   },
   "dependencies": {
     "lodash-es": "^4.17.21",
-    "type-fest": "^4.12.0"
+    "type-fest": "^4.13.1"
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/lodash-es": "^4.17.12",
     "bun-types": "latest",
-    "npm-check-updates": "^16.14.15",
+    "npm-check-updates": "^16.14.17",
     "npm-sort": "^0.0.4",
-    "rollup": "^4.12.1",
+    "rollup": "^4.13.0",
     "rollup-plugin-cleanup": "^3.2.1",
     "rollup-plugin-ts": "^3.4.5",
     "tsx": "^4.7.1",
-    "typescript": "^5.4.2"
+    "typescript": "^5.4.3"
   }
 }
-- 
2.49.1