From 65819e5c3871738b56867b4d5bcf2371849e1980 Mon Sep 17 00:00:00 2001
From: Chris Thoburn <runspired@gmail.com>
Date: Sun, 10 Mar 2024 16:17:54 -0700
Subject: [PATCH] feat: fix types for legacy decorator syntax

---
 packages/model/src/-private/belongs-to.ts     | 10 +++----
 packages/model/src/-private/has-many.ts       | 10 +++----
 .../model/src/-private/model.type-test.ts     | 27 +++++++++++++++++++
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/packages/model/src/-private/belongs-to.ts b/packages/model/src/-private/belongs-to.ts
index 048ba69950d..2eb5c0a4d80 100644
--- a/packages/model/src/-private/belongs-to.ts
+++ b/packages/model/src/-private/belongs-to.ts
@@ -275,12 +275,12 @@ export function belongsTo(): never;
 export function belongsTo(type: string): never;
 export function belongsTo<T>(
   type: TypeFromInstance<NoNull<T>>,
-  options: RelationshipOptions<T, false>
+  options: RelationshipOptions<T, boolean>
 ): RelationshipDecorator<T>;
-export function belongsTo<K extends Promise<unknown>, T extends Awaited<K> = Awaited<K>>(
-  type: TypeFromInstance<NoNull<T>>,
-  options: RelationshipOptions<T, true>
-): RelationshipDecorator<K>;
+// export function belongsTo<K extends Promise<unknown>, T extends Awaited<K> = Awaited<K>>(
+//   type: TypeFromInstance<NoNull<T>>,
+//   options: RelationshipOptions<T, true>
+// ): RelationshipDecorator<K>;
 export function belongsTo(type: string, options: RelationshipOptions<unknown, boolean>): RelationshipDecorator<unknown>;
 export function belongsTo<T>(
   type?: TypeFromInstance<NoNull<T>>,
diff --git a/packages/model/src/-private/has-many.ts b/packages/model/src/-private/has-many.ts
index f3171810708..d85e6aba4d3 100644
--- a/packages/model/src/-private/has-many.ts
+++ b/packages/model/src/-private/has-many.ts
@@ -258,12 +258,12 @@ export function hasMany(): never;
 export function hasMany(type: string): never;
 export function hasMany<T>(
   type: TypeFromInstance<NoNull<T>>,
-  options: RelationshipOptions<T, false>
+  options: RelationshipOptions<T, boolean>
 ): RelationshipDecorator<T>;
-export function hasMany<K extends Promise<unknown>, T extends Awaited<K> = Awaited<K>>(
-  type: TypeFromInstance<NoNull<T>>,
-  options: RelationshipOptions<T, true>
-): RelationshipDecorator<K>;
+// export function hasMany<K extends Promise<unknown>, T extends Awaited<K> = Awaited<K>>(
+//   type: TypeFromInstance<NoNull<T>>,
+//   options: RelationshipOptions<T, true>
+// ): RelationshipDecorator<K>;
 export function hasMany(type: string, options: RelationshipOptions<unknown, boolean>): RelationshipDecorator<unknown>;
 export function hasMany<T>(
   type?: TypeFromInstance<NoNull<T>>,
diff --git a/packages/model/src/-private/model.type-test.ts b/packages/model/src/-private/model.type-test.ts
index 20cf1f51d05..642103560ff 100644
--- a/packages/model/src/-private/model.type-test.ts
+++ b/packages/model/src/-private/model.type-test.ts
@@ -60,6 +60,33 @@ expectTypeOf(branded.bestFriend).toEqualTypeOf<BrandedUser>();
 expectTypeOf<Awaited<typeof branded.friends>>().toEqualTypeOf<ManyArray<BrandedUser>>();
 expectTypeOf<Awaited<typeof branded.twin>>().toEqualTypeOf<BrandedUser | null>();
 
+class BrandedTypedUser extends Model {
+  @attr('string') declare name: string | null;
+  @hasMany<BrandedTypedUser>('user', { async: false, inverse: null }) declare enemies: ManyArray<BrandedTypedUser>;
+  @belongsTo<BrandedTypedUser>('user', { async: false, inverse: null }) declare bestFriend: BrandedTypedUser;
+  @hasMany<BrandedTypedUser>('user', { async: true, inverse: 'friends' })
+  declare friends: PromiseManyArray<BrandedTypedUser>;
+  @belongsTo<BrandedTypedUser>('user', { async: true, inverse: 'twin' })
+  declare twin: PromiseBelongsTo<BrandedTypedUser>;
+  @hasMany<BrandedTypedUser>('user', { async: false, inverse: 'leader' })
+  declare crew: PromiseManyArray<BrandedTypedUser>;
+  @belongsTo<BrandedTypedUser>('user', { async: false, inverse: 'crew' })
+  declare leader: PromiseBelongsTo<BrandedTypedUser>;
+
+  [ResourceType] = 'user' as const;
+}
+const brandedAndTyped = new BrandedTypedUser();
+
+expectTypeOf<Awaited<PromiseManyArray<BrandedTypedUser>>['modelName']>().toEqualTypeOf<'user'>();
+expectTypeOf<ManyArray<BrandedTypedUser>['modelName']>().toEqualTypeOf<'user'>();
+expectTypeOf<ManyArray<BrandedTypedUser>>().toMatchTypeOf<BrandedTypedUser[]>();
+
+expectTypeOf(brandedAndTyped.name).toEqualTypeOf<string | null>();
+expectTypeOf(brandedAndTyped.enemies).toEqualTypeOf<ManyArray<BrandedTypedUser>>();
+expectTypeOf(brandedAndTyped.bestFriend).toEqualTypeOf<BrandedTypedUser>();
+expectTypeOf<Awaited<typeof brandedAndTyped.friends>>().toEqualTypeOf<ManyArray<BrandedTypedUser>>();
+expectTypeOf<Awaited<typeof brandedAndTyped.twin>>().toEqualTypeOf<BrandedTypedUser | null>();
+
 // ------------------------------
 // References
 // ------------------------------