dfx 0.44.0 → 0.45.0

package/Interactions/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/Interactions/utils.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,WAA4C,EAC5C,EAAE;IACF,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAMhC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QACX,GAAG,GAAG;QACN,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;KACtC,CAAC,EACF;QACE,YAAY,EAAE,EAAE;QAChB,wBAAwB,EAAE,EAAE;QAC5B,uBAAuB,EAAE,EAAE;QAC3B,gBAAgB,EAAE,EAAE;QACpB,WAAW,EAAE,EAAE;KAChB,CACF,CAAA;IAED,MAAM,QAAQ,GAAG;QACf,GAAG,OAAO,CAAC,wBAAwB;QACnC,GAAG,OAAO,CAAC,uBAAuB;KACnC,CAAC,MAAM,CACN,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QACX,GAAG,GAAG;QACN,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;KACpB,CAAC,EACF,EAGC,CACF,CAAA;IAED,OAAO;QACL,GAAG,OAAO;QACV,QAAQ;KACT,CAAA;AACH,CAAC,CAAA;AACD,MAAM,OAAO,GAA2B;IACtC,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,EAAE;IACL,CAAC,EAAE,EAAE;IACL,CAAC,EAAE,EAAE;IACL,CAAC,EAAE,EAAE;IACL,CAAC,EAAE,EAAE;IACL,CAAC,EAAE,EAAE;IACL,CAAC,EAAE,EAAE;IACL,CAAC,EAAE,EAAE;IACL,CAAC,EAAE,EAAE;IACL,CAAC,EAAE,EAAE;IACL,CAAC,EAAE,EAAE;IACL,CAAC,EAAE,EAAE;CACN,CAAA;AAED,MAAM,UAAU,OAAO,CAAC,SAAiB;IACvC,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAA;IACtE,IAAI,CAAC,CAAA;IACL,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACjC,MAAM,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QACnC,MAAM,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QACvC,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,SAAS,EAAE;YACtC,MAAK;SACN;QACD,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;KACxB;IACD,OAAO,CAAC,KAAK,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;AACvD,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/Interactions/utils.ts"],"names":[],"mappings":"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"}

package/Interactions/webhook.d.ts

@@ -1,4 +1,4 @@
-import { ConfigSecret, Config, Discord, Effect, Cause } from "dfx/_common";
+import { ConfigSecret, Config, Discord, Chunk, Effect, Cause } from "dfx/_common";
 import { DefinitionNotFound } from "./handlers.js";
 import { InteractionBuilder } from "./index.js";
 export declare class BadWebhookSignature {
@@ -33,13 +33,13 @@ export interface HandleWebhookOpts<E> {
  * @tsplus getter dfx/InteractionBuilder webhookHandler
  * @tsplus location "dfx/Interactions/webhook"
  */
-export declare const makeHandler: <R, E>(ix: InteractionBuilder<R, E>) => ({ headers, body, success, error, }: HandleWebhookOpts<DefinitionNotFound | BadWebhookSignature | WebhookParseError | E>) => import("@effect/io/Effect").Effect<R, never, void>;
+export declare const makeHandler: <R, E, TE>(ix: InteractionBuilder<R, E, TE>) => ({ headers, body, success, error, }: HandleWebhookOpts<DefinitionNotFound | BadWebhookSignature | WebhookParseError | E>) => import("@effect/io/Effect").Effect<WebhookConfig, never, void>;
 /**
  * @tsplus getter dfx/InteractionBuilder simpleWebhookHandler
  * @tsplus location "dfx/Interactions/webhook"
  */
-export declare const makeSimpleHandler: <R, E>(ix: InteractionBuilder<R, E>) => ({ headers, body }: {
+export declare const makeSimpleHandler: <R, E, TE>(ix: InteractionBuilder<R, E, TE>) => ({ headers, body }: {
     headers: Headers;
     body: string;
-}) => import("@effect/io/Effect").Effect<WebhookConfig | Exclude<R, import("../types.js").Interaction>, DefinitionNotFound | BadWebhookSignature | WebhookParseError | E, import("../types.js").InteractionResponse>;
+}) => import("@effect/io/Effect").Effect<WebhookConfig, DefinitionNotFound | BadWebhookSignature | WebhookParseError, import("../types.js").InteractionResponse>;
 export {};

package/Interactions/webhook.js

@@ -5,6 +5,7 @@ import * as tsplus_module_4 from "dfx/_common";
 import * as tsplus_module_5 from "@effect/io/Layer";
 import * as tsplus_module_6 from "@effect/data/Function";
 import * as tsplus_module_7 from "@effect/io/Effect";
+import * as tsplus_module_8 from "@effect/data/Chunk";
 import Nacl from "tweetnacl";
 import { handlers } from "./handlers.js";
 import { Interaction } from "./index.js";
@@ -34,23 +35,22 @@ export class WebhookParseError {
     }
 }
 const fromHeadersAndBody = (headers, body) => tsplus_module_7.flatMap(WebhookConfig, ({ publicKey }) => tsplus_module_7.flatMap(checkSignature(publicKey, headers, body), () => tsplus_module_7.tryCatch(() => JSON.parse(body), reason => new WebhookParseError(reason))));
-const run = (definitions) => {
-    const handler = handlers(definitions);
+const run = (definitions, handleResponse) => {
+    const handler = handlers(definitions, handleResponse);
     return (headers, body) => tsplus_module_7.flatMap(fromHeadersAndBody(headers, body), interaction => tsplus_module_7.provideService(handler[interaction.type](interaction), Interaction, interaction));
 };
 /**
  * @tsplus getter dfx/InteractionBuilder webhookHandler
  */
 export const makeHandler = (ix) => {
-    const handle = run(ix.definitions);
-    return ({ headers, body, success, error, }) => tsplus_module_7.catchAllCause(ix
-        .transform(tsplus_module_7.flatMap(ix.transformRespond(handle(headers, body)), success)), error);
+    const handle = run(tsplus_module_8.map(ix.definitions, ([d]) => [d, tsplus_module_6.identity]), (_i, r) => tsplus_module_7.succeed(r));
+    return ({ headers, body, success, error, }) => tsplus_module_7.catchAllCause(tsplus_module_7.flatMap(handle(headers, body), success), error);
 };
 /**
  * @tsplus getter dfx/InteractionBuilder simpleWebhookHandler
  */
 export const makeSimpleHandler = (ix) => {
-    const handle = run(ix.definitions);
+    const handle = run(tsplus_module_8.map(ix.definitions, ([d]) => [d, tsplus_module_6.identity]), (_i, r) => tsplus_module_7.succeed(r));
     return ({ headers, body }) => handle(headers, body);
 };
 //# sourceMappingURL=webhook.js.map

package/Interactions/webhook.js.map

@@ -1 +1 @@
-{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../src/Interactions/webhook.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../src/Interactions/webhook.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dfx",
-    "version": "0.44.0",
+    "version": "0.45.0",
     "type": "module",
     "publishConfig": {
         "access": "public",
@@ -48,5 +48,5 @@
         "ws": "^8.13.0"
     },
     "sideEffects": false,
-    "gitHead": "e8c64ec253a70ff461247eafcccce4d181a1d67d"
+    "gitHead": "1120664f76fc34a00312d277c22007b37d623a30"
 }

package/src/Interactions/builder.ts

@@ -0,0 +1,156 @@
+import * as Http from "@effect-http/client"
+import { catchTag } from "@effect/io/Effect"
+import { DiscordREST } from "dfx"
+import { Discord, Effect } from "dfx/_common"
+import * as D from "./definitions.js"
+
+type ExtractTag<A> = A extends { _tag: infer Tag }
+  ? Tag extends string
+    ? Tag
+    : never
+  : never
+
+/**
+ * @tsplus type dfx/InteractionBuilder
+ */
+export class InteractionBuilder<R, E, TE> {
+  constructor(
+    readonly definitions: Chunk<
+      readonly [
+        handler: D.InteractionDefinition<R, E>,
+        transform: (self: Effect<any, any, any>) => Effect<R, TE, void>,
+      ]
+    >,
+    readonly transform: (self: Effect<any, any, any>) => Effect<R, TE, void>,
+  ) {}
+
+  add<R1, E1>(definition: D.InteractionDefinition<R1, E1>) {
+    return new InteractionBuilder<R | R1, E | E1, TE | E1>(
+      this.definitions.append([definition, this.transform] as const),
+      this.transform,
+    )
+  }
+
+  concat<R1, E1, TE1>(builder: InteractionBuilder<R1, E1, TE1>) {
+    return new InteractionBuilder<R | R1, E | E1, TE | TE1>(
+      this.definitions.concat(builder.definitions),
+      this.transform,
+    )
+  }
+
+  private transformTransform<R1, E1>(
+    f: (selr: Effect<R, TE, void>) => Effect<R1, E1, void>,
+  ) {
+    return new InteractionBuilder<R1, E, E1>(
+      this.definitions.map(([d, t]) => [d as any, _ => f(t(_)) as any]),
+      _ => f(this.transform(_)) as any,
+    )
+  }
+
+  private transformHandlers<R1, E1>(
+    f: (
+      selr: Effect<R, E, Discord.InteractionResponse>,
+    ) => Effect<R1, E1, Discord.InteractionResponse>,
+  ) {
+    return new InteractionBuilder<
+      R1,
+      E1,
+      Exclude<TE, Exclude<E, E1>> | Exclude<E1, E>
+    >(
+      this.definitions.map(([d, t]) => [
+        {
+          ...d,
+          handle: Effect.isEffect(d.handle)
+            ? f(d.handle)
+            : (_: any) => f((d.handle as any)(_)),
+        } as any,
+        t as any,
+      ]),
+      this.transform as any,
+    )
+  }
+
+  catchAllCause<R1, E1>(f: (cause: Cause<TE>) => Effect<R1, E1, void>) {
+    return this.transformTransform<R | R1, E1>(_ => _.catchAllCause(f))
+  }
+
+  catchAllCauseRespond<R1, E1>(
+    f: (cause: Cause<E>) => Effect<R1, E1, Discord.InteractionResponse>,
+  ) {
+    return this.transformHandlers<R | R1, E1>(_ => _.catchAllCause(f))
+  }
+
+  catchAll<R1, E1>(f: (error: TE) => Effect<R1, E1, void>) {
+    return this.transformTransform<R | R1, E1>(_ => _.catchAll(f))
+  }
+
+  catchAllRespond<R1, E1>(
+    f: (error: E) => Effect<R1, E1, Discord.InteractionResponse>,
+  ) {
+    return this.transformHandlers<R | R1, E1>(_ => _.catchAll(f))
+  }
+
+  catchTag<T extends ExtractTag<E>, R1, E1>(
+    tag: T,
+    f: (error: Extract<TE, { _tag: T }>) => Effect<R1, E1, void>,
+  ) {
+    return this.transformTransform<R | R1, Exclude<TE, { _tag: T }> | E1>(
+      _ => catchTag(_ as any, tag, f as any) as any,
+    )
+  }
+
+  catchTagRespond<T extends ExtractTag<E>, R1, E1>(
+    tag: T,
+    f: (
+      error: Extract<E, { _tag: T }>,
+    ) => Effect<R1, E1, Discord.InteractionResponse>,
+  ) {
+    return this.transformHandlers<R | R1, Exclude<E, { _tag: T }> | E1>(
+      _ => catchTag(_ as any, tag, f as any) as any,
+    )
+  }
+
+  get syncGlobal() {
+    const commands = this.definitions
+      .map(([d, _]) => d)
+      .filter(
+        (c): c is D.GlobalApplicationCommand<R, E> =>
+          c._tag === "GlobalApplicationCommand",
+      )
+      .map(c => c.command)
+
+    return DiscordREST.flatMap(rest =>
+      rest
+        .getCurrentBotApplicationInformation()
+        .flatMap(r => r.json)
+        .flatMap(app =>
+          rest.bulkOverwriteGlobalApplicationCommands(app.id, {
+            body: Http.body.json(commands),
+          }),
+        ),
+    )
+  }
+
+  syncGuild(appId: Discord.Snowflake, guildId: Discord.Snowflake) {
+    const commands = this.definitions
+      .map(([d, _]) => d)
+      .filter(
+        (c): c is D.GuildApplicationCommand<R, E> =>
+          c._tag === "GuildApplicationCommand",
+      )
+      .map(c => c.command)
+
+    return DiscordREST.flatMap(rest =>
+      rest.bulkOverwriteGuildApplicationCommands(
+        appId,
+        guildId,
+        commands as any,
+      ),
+    )
+  }
+}
+
+export const builder = new InteractionBuilder<never, never, never>(
+  Chunk.empty(),
+  identity as any,
+)

package/src/Interactions/definitions.ts

@@ -143,7 +143,7 @@ type DeepReadonlyObject<T> = {
   readonly [P in keyof T]: DeepReadonly<T[P]>
 }
 
-type CommandHandler<R, E, A = any> =
+export type CommandHandler<R, E, A = any> =
   | Effect<R, E, Discord.InteractionResponse>
   | CommandHandlerFn<R, E, A>
 
@@ -196,7 +196,7 @@ export interface CommandHelper<A> {
   >
 }
 
-type CommandHandlerFn<R, E, A> = (
+export type CommandHandlerFn<R, E, A> = (
   i: CommandHelper<A>,
 ) => Effect<R, E, Discord.InteractionResponse>
 

package/src/Interactions/gateway.ts

@@ -3,7 +3,10 @@ import { DiscordGateway } from "dfx/DiscordGateway"
 import { DiscordREST, DiscordRESTError } from "dfx/DiscordREST"
 import { DefinitionNotFound, handlers } from "./handlers.js"
 import { Interaction, InteractionBuilder, builder } from "./index.js"
-import { splitDefinitions } from "./utils.js"
+import type {
+  GlobalApplicationCommand,
+  GuildApplicationCommand,
+} from "./definitions.js"
 
 export interface RunOpts {
   sync?: boolean
@@ -13,26 +16,36 @@ export interface RunOpts {
  * @tsplus pipeable dfx/InteractionBuilder runGateway
  */
 export const run =
-  <R, R2, E, E2>(
+  <R, R2, E, TE, E2>(
     postHandler: (
       effect: Effect<
         R | DiscordREST | Discord.Interaction,
-        E | DiscordRESTError | DefinitionNotFound,
+        TE | DiscordRESTError | DefinitionNotFound,
         void
       >,
     ) => Effect<R2, E2, void>,
     { sync = true }: RunOpts = {},
   ) =>
   (
-    ix: InteractionBuilder<R, E>,
+    ix: InteractionBuilder<R, E, TE>,
   ): Effect<
     DiscordREST | DiscordGateway | Exclude<R2, Discord.Interaction>,
     E2 | DiscordRESTError | Http.ResponseDecodeError,
     never
   > =>
     Do($ => {
-      const { GlobalApplicationCommand, GuildApplicationCommand } =
-        splitDefinitions(ix.definitions)
+      const GlobalApplicationCommand = ix.definitions
+        .map(_ => _[0])
+        .filter(
+          (_): _ is GlobalApplicationCommand<R, E> =>
+            _._tag === "GlobalApplicationCommand",
+        ).toReadonlyArray
+      const GuildApplicationCommand = ix.definitions
+        .map(_ => _[0])
+        .filter(
+          (_): _ is GuildApplicationCommand<R, E> =>
+            _._tag === "GuildApplicationCommand",
+        ).toReadonlyArray
 
       const gateway = $(DiscordGateway)
       const rest = $(DiscordREST)
@@ -43,7 +56,9 @@ export const run =
 
       const globalSync = rest.bulkOverwriteGlobalApplicationCommands(
         application.id,
-        { body: Http.body.json(GlobalApplicationCommand.map(a => a.command)) },
+        {
+          body: Http.body.json(GlobalApplicationCommand.map(_ => _.command)),
+        },
       )
 
       const guildSync = GuildApplicationCommand.length
@@ -51,21 +66,17 @@ export const run =
             rest.bulkOverwriteGuildApplicationCommands(
               application.id,
               a.id,
-              GuildApplicationCommand.map(a => a.command) as any,
+              GuildApplicationCommand.map(_ => _.command) as any,
             ),
           )
         : Effect.never()
 
-      const handle = handlers(ix.definitions)
+      const handle = handlers(ix.definitions, (i, r) =>
+        rest.createInteractionResponse(i.id, i.token, r),
+      )
 
       const run = gateway.handleDispatch("INTERACTION_CREATE", i =>
-        pipe(
-          ix
-            .transformRespond(handle[i.type](i))
-            .tap(r => rest.createInteractionResponse(i.id, i.token, r)),
-          ix.transform,
-          postHandler,
-        ).provideService(Interaction, i),
+        postHandler(handle[i.type](i)).provideService(Interaction, i),
       )
 
       return $(sync ? run.zipParRight(globalSync).zipParRight(guildSync) : run)
@@ -74,24 +85,32 @@ export const run =
 const makeRegistry = Do($ => {
   const ref = $(Ref.make(builder))
 
-  const register = (ix: InteractionBuilder<never, never>) =>
-    ref.update(_ => _.concat(ix))
+  const register = <E>(ix: InteractionBuilder<never, E, never>) =>
+    ref.update(_ => _.concat(ix as any))
 
-  const run = ref.get.flatMap(_ =>
-    _.runGateway(_ => _.catchAllCause(_ => _.logErrorCause)),
-  )
+  const run = <R, E>(
+    onError: (
+      _: Cause<DiscordRESTError | DefinitionNotFound>,
+    ) => Effect<R, E, void>,
+    opts?: RunOpts,
+  ) => ref.get.flatMap(_ => _.runGateway(_ => _.catchAllCause(onError), opts))
 
   return { register, run } as const
 })
 
 export interface InteractionsRegistry {
-  readonly register: (
-    ix: InteractionBuilder<never, never>,
+  readonly register: <E>(
+    ix: InteractionBuilder<never, E, never>,
   ) => Effect<never, never, void>
 
-  readonly run: Effect<
-    DiscordREST | DiscordGateway,
-    DiscordRESTError | Http.ResponseDecodeError,
+  readonly run: <R, E>(
+    onError: (
+      _: Cause<DiscordRESTError | DefinitionNotFound>,
+    ) => Effect<R, E, void>,
+    opts?: RunOpts,
+  ) => Effect<
+    DiscordREST | DiscordGateway | Exclude<R, Discord.Interaction>,
+    DiscordRESTError | Http.ResponseDecodeError | E,
     never
   >
 }

package/src/Interactions/handlers.ts

@@ -1,36 +1,38 @@
-import * as Arr from "@effect/data/ReadonlyArray"
 import * as IxHelpers from "dfx/Helpers/interactions"
 import * as Ctx from "./context.js"
 import * as D from "./definitions.js"
-import { splitDefinitions } from "./utils.js"
+import { flattenDefinitions, splitDefinitions } from "./utils.js"
 
 export class DefinitionNotFound {
   readonly _tag = "DefinitionNotFound"
   constructor(readonly interaction: Discord.Interaction) {}
 }
 
-type Handler<R, E> = Effect<
+type Handler<R, E, A> = Effect<
   R | Discord.Interaction,
   E | DefinitionNotFound,
-  Discord.InteractionResponse
+  A
 >
 
-const context: D.CommandHelper<any> = {
-  resolve: Ctx.resolved,
-  option: Ctx.option,
-  optionValue: Ctx.optionValue,
-  optionValueOptional: Ctx.optionValueOptional,
-  subCommands: Ctx.handleSubCommands,
-} as any
-
-export const handlers = <R, E>(
-  definitions: D.InteractionDefinition<R, E>[],
+export const handlers = <R, E, TE, A, B>(
+  definitions: Chunk<
+    readonly [
+      handler: D.InteractionDefinition<R, E>,
+      transform: (self: Effect<R, E, A>) => Effect<R, TE, B>,
+    ]
+  >,
+  handleResponse: (
+    ix: Discord.Interaction,
+    _: Discord.InteractionResponse,
+  ) => Effect<R, E, A>,
 ): Record<
   Discord.InteractionType,
-  (i: Discord.Interaction) => Handler<R, E>
+  (i: Discord.Interaction) => Handler<R, E, B>
 > => {
+  const flattened = flattenDefinitions(definitions, handleResponse)
+
   const { Commands, Autocomplete, MessageComponent, ModalSubmit } =
-    splitDefinitions(definitions)
+    splitDefinitions(flattened)
 
   return {
     [Discord.InteractionType.PING]: () =>
@@ -41,90 +43,67 @@ export const handlers = <R, E>(
     [Discord.InteractionType.APPLICATION_COMMAND]: i => {
       const data = i.data as Discord.ApplicationCommandDatum
 
-      return Maybe.fromNullable(Commands[data.name])
-        .match(
-          () => Effect.fail(new DefinitionNotFound(i)) as Handler<R, E>,
-          command =>
-            Effect.isEffect(command.handle)
-              ? command.handle
-              : command.handle(context),
-        )
-        .provideService(Ctx.ApplicationCommand, data)
+      return Maybe.fromNullable(Commands[data.name]).match(
+        () => Effect.fail(new DefinitionNotFound(i)),
+        command =>
+          command
+            .handle(i)
+            .provideService(Ctx.ApplicationCommand, data) as Handler<R, E, B>,
+      )
     },
 
-    [Discord.InteractionType.MODAL_SUBMIT]: (i: Discord.Interaction) => {
+    [Discord.InteractionType.MODAL_SUBMIT]: i => {
       const data = i.data as Discord.ModalSubmitDatum
 
-      return pipe(
-        ModalSubmit,
-        Arr.map(a =>
-          Effect.all({
-            command: Effect.succeed(a),
-            match: a.predicate(data.custom_id),
-          }),
+      return ModalSubmit.find(_ => _.predicate(data.custom_id)).flatMap(_ =>
+        _.match(
+          () => Effect.fail(new DefinitionNotFound(i)),
+          match =>
+            match
+              .handle(i)
+              .provideService(Ctx.ModalSubmitData, data) as Handler<R, E, B>,
         ),
-        _ =>
-          Effect.allPar(_)
-            .flatMap(_ =>
-              Arr.findFirst(_, _ => _.match).match(
-                () => Effect.fail(new DefinitionNotFound(i)) as Handler<R, E>,
-                a => a.command.handle,
-              ),
-            )
-            .provideService(Ctx.ModalSubmitData, data),
       )
     },
 
     [Discord.InteractionType.MESSAGE_COMPONENT]: i => {
       const data = i.data as Discord.MessageComponentDatum
 
-      return pipe(
-        MessageComponent,
-        Arr.map(a =>
-          Effect.all({
-            command: Effect.succeed(a),
-            match: a.predicate(data.custom_id),
-          }),
-        ),
+      return MessageComponent.find(_ => _.predicate(data.custom_id)).flatMap(
         _ =>
-          Effect.allPar(_)
-            .flatMap(commands =>
-              Arr.findFirst(commands, _ => _.match).match(
-                () => Effect.fail(new DefinitionNotFound(i)) as Handler<R, E>,
-                _ => _.command.handle,
-              ),
-            )
-            .provideService(Ctx.MessageComponentData, data),
+          _.match(
+            () => Effect.fail(new DefinitionNotFound(i)),
+            match =>
+              match
+                .handle(i)
+                .provideService(Ctx.MessageComponentData, data) as Handler<
+                R,
+                E,
+                B
+              >,
+          ),
       )
     },
 
     [Discord.InteractionType.APPLICATION_COMMAND_AUTOCOMPLETE]: i => {
       const data = i.data as Discord.ApplicationCommandDatum
 
-      return IxHelpers.focusedOption(data)
-        .map(focusedOption =>
-          pipe(
-            Autocomplete,
-            Arr.map(_ =>
-              Effect.all({
-                command: Effect.succeed(_),
-                match: _.predicate(data, focusedOption),
-              }),
+      return IxHelpers.focusedOption(data).match(
+        () => Effect.fail(new DefinitionNotFound(i)),
+        focusedOption =>
+          Autocomplete.find(_ => _.predicate(data, focusedOption)).flatMap(_ =>
+            _.match(
+              () => Effect.fail(new DefinitionNotFound(i)),
+              match =>
+                match
+                  .handle(i)
+                  .provideService(Ctx.ApplicationCommand, data)
+                  .provideService(Ctx.FocusedOptionContext, {
+                    focusedOption,
+                  }) as Handler<R, E, B>,
             ),
-            _ =>
-              Effect.allPar(_)
-                .flatMap(_ =>
-                  Arr.findFirst(_, _ => _.match).match(
-                    () =>
-                      Effect.fail(new DefinitionNotFound(i)) as Handler<R, E>,
-                    _ => _.command.handle,
-                  ),
-                )
-                .provideService(Ctx.ApplicationCommand, data)
-                .provideService(Ctx.FocusedOptionContext, { focusedOption }),
           ),
-        )
-        .getOrElse(() => Effect.fail(new DefinitionNotFound(i)))
+      )
     },
   }
 }