From 562d64714c5c3423cc01f7b64d84fca2f19f00dc Mon Sep 17 00:00:00 2001
From: Tim Smart <tim.smart@arisechurch.com>
Date: Fri, 9 Dec 2022 11:05:29 +1300
Subject: [PATCH] fix: sub command Resolvables

---
 src/Interactions/definitions.ts | 97 ++++++++++++++++-----------------
 1 file changed, 48 insertions(+), 49 deletions(-)

diff --git a/src/Interactions/definitions.ts b/src/Interactions/definitions.ts
index ac5ef47..35820ed 100644
--- a/src/Interactions/definitions.ts
+++ b/src/Interactions/definitions.ts
@@ -137,7 +137,7 @@ type CommandHandler<R, E, A = any> =
 
 export interface CommandHelper<A> {
   resolve: <T>(
-    name: Resolvables<A>["name"],
+    name: AllResolvables<A>["name"],
     f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => T | undefined,
   ) => Effect<Discord.Interaction, ResolvedDataNotFound, T>
 
@@ -188,30 +188,19 @@ type CommandHandlerFn<R, E, A> = (
   i: CommandHelper<A>,
 ) => Effect<R, E, Discord.InteractionResponse>
 
-type StringLiteral<T> = T extends string
-  ? string extends T
-    ? never
-    : T
-  : never
-
-type Option<A> = A extends { name: infer N }
-  ? N extends StringLiteral<N>
-    ? A
-    : never
-  : never
-
-type Options<A, T> = A extends T
-  ? T
+// == Sub commands
+type SubCommands<A> = A extends {
+  type: Discord.ApplicationCommandOptionType.SUB_COMMAND
+  options?: Discord.ApplicationCommandOption[]
+}
+  ? A
   : A extends { options: Discord.ApplicationCommandOption[] }
-  ? Options<A["options"][number], T>
+  ? SubCommands<A["options"][number]>
   : never
 
-type OptionsWithLiteral<A, T> = A extends {
-  options: Discord.ApplicationCommandOption[]
-}
-  ? Extract<A["options"][number], Option<A["options"][number]> & T>
-  : never
+type SubCommandNames<A> = Option<SubCommands<A>>["name"]
 
+// == Command options
 type CommandOptionType = Exclude<
   Discord.ApplicationCommandOptionType,
   | Discord.ApplicationCommandOptionType.SUB_COMMAND
@@ -221,41 +210,28 @@ type CommandOptionType = Exclude<
 type CommandOptions<A> = OptionsWithLiteral<
   A,
   {
-    name: string
     type: CommandOptionType
   }
 >
 
-type RequiredCommandOptions<A> = OptionsWithLiteral<
-  A,
+type SubCommandOptions<A> = Extract<
+  Option<Exclude<SubCommands<A>["options"], undefined>[number]>,
   {
     type: CommandOptionType
-    name: string
-    required: true
   }
 >
 
-type SubCommands<A> = A extends {
-  name: string
-  type: Discord.ApplicationCommandOptionType.SUB_COMMAND
-  options?: Discord.ApplicationCommandOption[]
-}
-  ? A
-  : A extends { options: Discord.ApplicationCommandOption[] }
-  ? SubCommands<A["options"][number]>
-  : never
-
-type SubCommandNames<A> = Option<SubCommands<A>>["name"]
+type AllCommandOptions<A> = CommandOptions<A> | SubCommandOptions<A>
 
-type SubCommandOptions<A> = Extract<
-  Option<Exclude<SubCommands<A>["options"], undefined>[number]>,
+// == Required options
+type RequiredCommandOptions<A> = OptionsWithLiteral<
+  A,
   {
     type: CommandOptionType
+    required: true
   }
 >
 
-type AllCommandOptions<A> = CommandOptions<A> | SubCommandOptions<A>
-
 type RequiredSubCommandOptions<A> = Extract<
   SubCommandOptions<A>,
   { required: true }
@@ -265,14 +241,37 @@ type AllRequiredCommandOptions<A> =
   | RequiredCommandOptions<A>
   | RequiredSubCommandOptions<A>
 
-type Resolvables<A> = Options<
-  A,
+// == Resolveables
+type ResolvableType =
+  | Discord.ApplicationCommandOptionType.ROLE
+  | Discord.ApplicationCommandOptionType.USER
+  | Discord.ApplicationCommandOptionType.MENTIONABLE
+  | Discord.ApplicationCommandOptionType.CHANNEL
+
+type Resolvables<A> = OptionsWithLiteral<A, { type: ResolvableType }>
+type SubCommandResolvables<A> = Extract<
+  Option<Exclude<SubCommands<A>["options"], undefined>[number]>,
   {
-    name: string
-    type:
-      | Discord.ApplicationCommandOptionType.ROLE
-      | Discord.ApplicationCommandOptionType.USER
-      | Discord.ApplicationCommandOptionType.MENTIONABLE
-      | Discord.ApplicationCommandOptionType.CHANNEL
+    type: ResolvableType
   }
 >
+type AllResolvables<A> = Resolvables<A> | SubCommandResolvables<A>
+
+// == Utilities
+type StringLiteral<T> = T extends string
+  ? string extends T
+    ? never
+    : T
+  : never
+
+type Option<A> = A extends { name: infer N }
+  ? N extends StringLiteral<N>
+    ? A
+    : never
+  : never
+
+type OptionsWithLiteral<A, T> = A extends {
+  options: Discord.ApplicationCommandOption[]
+}
+  ? Extract<A["options"][number], Option<A["options"][number]> & T>
+  : never