From 92300ed673516978525e9690d0c47e175e205166 Mon Sep 17 00:00:00 2001
From: panteliselef <panteliselef@outlook.com>
Date: Tue, 12 Dec 2023 01:04:28 +0200
Subject: [PATCH] fix(types): Typescript v5 cannot infer types correctly

---
 .changeset/tame-olives-check.md              |  2 ++
 packages/types/src/organizationMembership.ts | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/tame-olives-check.md

diff --git a/.changeset/tame-olives-check.md b/.changeset/tame-olives-check.md
new file mode 100644
index 00000000000..a845151cc84
--- /dev/null
+++ b/.changeset/tame-olives-check.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/packages/types/src/organizationMembership.ts b/packages/types/src/organizationMembership.ts
index 3d9770d2610..c7d3bb9fc10 100644
--- a/packages/types/src/organizationMembership.ts
+++ b/packages/types/src/organizationMembership.ts
@@ -8,6 +8,11 @@ interface Base {
   role: string;
 }
 
+interface Placeholder {
+  permission: unknown;
+  role: unknown;
+}
+
 declare global {
   interface ClerkAuthorization {}
 }
@@ -45,14 +50,16 @@ export interface OrganizationMembershipResource extends ClerkResource {
   update: (updateParams: UpdateOrganizationMembershipParams) => Promise<OrganizationMembershipResource>;
 }
 
-export type OrganizationCustomPermissionKey = 'permission' extends keyof ClerkAuthorization
-  ? // @ts-ignore Typescript cannot infer the existence of the `permission` key even if we checking it above
-    ClerkAuthorization['permission']
+export type OrganizationCustomPermissionKey = ClerkAuthorization extends Placeholder
+  ? ClerkAuthorization['permission'] extends string
+    ? ClerkAuthorization['permission']
+    : Base['permission']
   : Base['permission'];
 
-export type OrganizationCustomRoleKey = 'role' extends keyof ClerkAuthorization
-  ? // @ts-ignore Typescript cannot infer the existence of the `role` key even if we checking it above
-    ClerkAuthorization['role']
+export type OrganizationCustomRoleKey = ClerkAuthorization extends Placeholder
+  ? ClerkAuthorization['role'] extends string
+    ? ClerkAuthorization['role']
+    : Base['role']
   : Base['role'];
 
 /**