dfx 0.17.4 → 0.17.5

package/Interactions/definitions.d.ts

@@ -47,9 +47,9 @@ type CommandHandler<R, E, A = any> = Effect<R, E, Discord.InteractionResponse> |
 export interface CommandHelper<A> {
     resolve: <T>(name: Resolvables<A>["name"], f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => T | undefined) => Effect<Discord.Interaction, ResolvedDataNotFound, T>;
     option: (name: CommandOptions<A>["name"]) => Effect<Discord.ApplicationCommandDatum, never, Maybe<Discord.ApplicationCommandInteractionDataOption>>;
-    optionValue: (name: RequiredCommandOptions<A>["name"]) => Effect<Discord.ApplicationCommandDatum, never, string>;
+    optionValue: (name: AllRequiredCommandOptions<A>["name"]) => Effect<Discord.ApplicationCommandDatum, never, string>;
     optionValueOptional: (name: CommandOptions<A>["name"]) => Effect<Discord.ApplicationCommandDatum, never, Maybe<string>>;
-    subCommands: <NER extends SubCommands<A> extends never ? never : Record<SubCommands<A>["name"], Effect<any, any, Discord.InteractionResponse>>>(commands: NER) => Effect<Exclude<[
+    subCommands: <NER extends SubCommandNames<A> extends never ? never : Record<SubCommandNames<A>, Effect<any, any, Discord.InteractionResponse>>>(commands: NER) => Effect<Exclude<[
         NER[keyof NER]
     ] extends [
         {
@@ -66,24 +66,43 @@ export interface CommandHelper<A> {
     }] ? E : never, Discord.InteractionResponse>;
 }
 type CommandHandlerFn<R, E, A> = (i: CommandHelper<A>) => Effect<R, E, Discord.InteractionResponse>;
-type ExtractOptions<A, T> = A extends {
-    type: T;
+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 : A extends {
+    options: Discord.ApplicationCommandOption[];
+} ? Options<A["options"][number], T> : never;
+type OptionsWithLiteral<A, T> = A extends {
+    options: Discord.ApplicationCommandOption[];
+} ? Extract<A["options"][number], Option<A["options"][number]> & T> : never;
+type CommandOptionType = Exclude<Discord.ApplicationCommandOptionType, Discord.ApplicationCommandOptionType.SUB_COMMAND | Discord.ApplicationCommandOptionType.SUB_COMMAND_GROUP>;
+type CommandOptions<A> = OptionsWithLiteral<A, {
+    name: string;
+    type: CommandOptionType;
+}>;
+type RequiredCommandOptions<A> = OptionsWithLiteral<A, {
+    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[];
-} ? ExtractOptions<A["options"][number], T> : never;
-type RequiredOptions<A, T> = A extends {
-    options: Discord.ApplicationCommandOption[];
-} ? Extract<A["options"][number], {
-    type: T;
-    required: true;
-}> : never;
-type CommandOptions<A> = ExtractOptions<A, Exclude<Discord.ApplicationCommandOptionType, Discord.ApplicationCommandOptionType.SUB_COMMAND | Discord.ApplicationCommandOptionType.SUB_COMMAND_GROUP>>;
-type SubCommands<A> = ExtractOptions<A, Discord.ApplicationCommandOptionType.SUB_COMMAND>;
-type RequiredSubCommandOptions<A> = Extract<Exclude<SubCommands<A>["options"], undefined>[number], {
+} ? SubCommands<A["options"][number]> : never;
+type SubCommandNames<A> = Option<SubCommands<A>>["name"];
+type SubCommandOptions<A> = Extract<Option<SubCommands<A>["options"]>, {
+    type: CommandOptionType;
+}>;
+type RequiredSubCommandOptions<A> = Extract<SubCommandOptions<A>, {
     required: true;
 }>;
-type RequiredCommandOptions<A> = RequiredOptions<A, Exclude<Discord.ApplicationCommandOptionType, Discord.ApplicationCommandOptionType.SUB_COMMAND | Discord.ApplicationCommandOptionType.SUB_COMMAND_GROUP>> | RequiredSubCommandOptions<A>;
-type Resolvables<A> = ExtractOptions<A, Discord.ApplicationCommandOptionType.ROLE | Discord.ApplicationCommandOptionType.USER | Discord.ApplicationCommandOptionType.MENTIONABLE | Discord.ApplicationCommandOptionType.CHANNEL>;
+type AllRequiredCommandOptions<A> = RequiredCommandOptions<A> | RequiredSubCommandOptions<A>;
+type Resolvables<A> = Options<A, {
+    name: string;
+    type: Discord.ApplicationCommandOptionType.ROLE | Discord.ApplicationCommandOptionType.USER | Discord.ApplicationCommandOptionType.MENTIONABLE | Discord.ApplicationCommandOptionType.CHANNEL;
+}>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dfx",
-  "version": "0.17.4",
+  "version": "0.17.5",
   "type": "module",
   "publishConfig": {
     "access": "public",
@@ -49,5 +49,5 @@
       "@fp-ts/data": "^0.0.20"
     }
   },
-  "gitHead": "395784fcbc3c9141614e9a0c69e44e5a944aba9e"
+  "gitHead": "a0f69c0023c9b346eaf490f314c18479b6618457"
 }