dfx 0.44.0 → 0.45.1

package/Interactions/builder.d.ts

@@ -0,0 +1,48 @@
+import { Chunk, Cause } from "dfx/_common";
+import * as Http from "@effect-http/client";
+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 declare class InteractionBuilder<R, E, TE> {
+    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>;
+    constructor(definitions: Chunk<readonly [
+        handler: D.InteractionDefinition<R, E>,
+        transform: (self: Effect<any, any, any>) => Effect<R, TE, void>
+    ]>, transform: (self: Effect<any, any, any>) => Effect<R, TE, void>);
+    add<R1, E1>(definition: D.InteractionDefinition<R1, E1>): InteractionBuilder<R | R1, E | E1, TE | E1>;
+    concat<R1, E1, TE1>(builder: InteractionBuilder<R1, E1, TE1>): InteractionBuilder<R | R1, E | E1, TE | TE1>;
+    private transformTransform;
+    private transformHandlers;
+    catchAllCause<R1, E1>(f: (cause: Cause<TE>) => Effect<R1, E1, void>): InteractionBuilder<R | R1, E, E1>;
+    catchAllCauseRespond<R1, E1>(f: (cause: Cause<E>) => Effect<R1, E1, Discord.InteractionResponse>): InteractionBuilder<R | R1, E1, Exclude<TE, Exclude<E, E1>> | Exclude<E1, E>>;
+    catchAll<R1, E1>(f: (error: TE) => Effect<R1, E1, void>): InteractionBuilder<R | R1, E, E1>;
+    catchAllRespond<R1, E1>(f: (error: E) => Effect<R1, E1, Discord.InteractionResponse>): InteractionBuilder<R | R1, E1, Exclude<TE, Exclude<E, E1>> | Exclude<E1, E>>;
+    catchTag<T extends ExtractTag<E>, R1, E1>(tag: T, f: (error: Extract<TE, {
+        _tag: T;
+    }>) => Effect<R1, E1, void>): InteractionBuilder<R | R1, E, E1 | Exclude<TE, {
+        _tag: T;
+    }>>;
+    catchTagRespond<T extends ExtractTag<E>, R1, E1>(tag: T, f: (error: Extract<E, {
+        _tag: T;
+    }>) => Effect<R1, E1, Discord.InteractionResponse>): InteractionBuilder<R | R1, E1 | Exclude<E, {
+        _tag: T;
+    }>, Exclude<TE, Exclude<E, E1 | Exclude<E, {
+        _tag: T;
+    }>>> | Exclude<E1, E> | Exclude<Exclude<E, {
+        _tag: T;
+    }>, E>>;
+    get syncGlobal(): Effect<DiscordREST, import("../DiscordREST.js").DiscordRESTError | Http.ResponseDecodeError, import("../DiscordREST/types.js").ResponseWithData<Discord.ApplicationCommand[]>>;
+    syncGuild(appId: Discord.Snowflake, guildId: Discord.Snowflake): Effect<DiscordREST, import("../DiscordREST.js").DiscordRESTError, import("../DiscordREST/types.js").ResponseWithData<Discord.ApplicationCommand[]>>;
+}
+export declare const builder: InteractionBuilder<never, never, never>;
+export {};

package/Interactions/builder.js

@@ -0,0 +1,68 @@
+import * as tsplus_module_1 from "@effect/data/Chunk";
+import * as tsplus_module_2 from "@effect/io/Effect";
+import * as tsplus_module_3 from "@effect/data/Function";
+import * as Http from "@effect-http/client";
+import { catchTag } from "@effect/io/Effect";
+import { DiscordREST } from "dfx";
+/**
+ * @tsplus type dfx/InteractionBuilder
+ */
+export class InteractionBuilder {
+    definitions;
+    transform;
+    constructor(definitions, transform) {
+        this.definitions = definitions;
+        this.transform = transform;
+    }
+    add(definition) {
+        return new InteractionBuilder(tsplus_module_1.append(this.definitions, [definition, this.transform]), this.transform);
+    }
+    concat(builder) {
+        return new InteractionBuilder(tsplus_module_1.concat(this.definitions, builder.definitions), this.transform);
+    }
+    transformTransform(f) {
+        return new InteractionBuilder(tsplus_module_1.map(this.definitions, ([d, t]) => [d, _ => f(t(_))]), _ => f(this.transform(_)));
+    }
+    transformHandlers(f) {
+        return new InteractionBuilder(tsplus_module_1.map(this.definitions, ([d, t]) => [
+            {
+                ...d,
+                handle: tsplus_module_2.isEffect(d.handle)
+                    ? f(d.handle)
+                    : (_) => f(d.handle(_)),
+            },
+            t,
+        ]), this.transform);
+    }
+    catchAllCause(f) {
+        return this.transformTransform(_ => tsplus_module_2.catchAllCause(_, f));
+    }
+    catchAllCauseRespond(f) {
+        return this.transformHandlers(_ => tsplus_module_2.catchAllCause(_, f));
+    }
+    catchAll(f) {
+        return this.transformTransform(_ => tsplus_module_2.catchAll(_, f));
+    }
+    catchAllRespond(f) {
+        return this.transformHandlers(_ => tsplus_module_2.catchAll(_, f));
+    }
+    catchTag(tag, f) {
+        return this.transformTransform(_ => catchTag(_, tag, f));
+    }
+    catchTagRespond(tag, f) {
+        return this.transformHandlers(_ => catchTag(_, tag, f));
+    }
+    get syncGlobal() {
+        const commands = tsplus_module_1.map(tsplus_module_1.filter(tsplus_module_1.map(this.definitions, ([d, _]) => d), (c) => c._tag === "GlobalApplicationCommand"), c => c.command);
+        return tsplus_module_2.flatMap(DiscordREST, rest => tsplus_module_2.flatMap(tsplus_module_2.flatMap(rest
+            .getCurrentBotApplicationInformation(), r => r.json), app => rest.bulkOverwriteGlobalApplicationCommands(app.id, {
+            body: Http.body.json(commands),
+        })));
+    }
+    syncGuild(appId, guildId) {
+        const commands = tsplus_module_1.map(tsplus_module_1.filter(tsplus_module_1.map(this.definitions, ([d, _]) => d), (c) => c._tag === "GuildApplicationCommand"), c => c.command);
+        return tsplus_module_2.flatMap(DiscordREST, rest => rest.bulkOverwriteGuildApplicationCommands(appId, guildId, commands));
+    }
+}
+export const builder = new InteractionBuilder(tsplus_module_1.empty(), tsplus_module_3.identity);
+//# sourceMappingURL=builder.js.map

package/Interactions/builder.js.map

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

package/Interactions/definitions.d.ts

@@ -48,7 +48,7 @@ interface DeepReadonlyArray<T> extends ReadonlyArray<DeepReadonly<T>> {
 type DeepReadonlyObject<T> = {
     readonly [P in keyof T]: DeepReadonly<T[P]>;
 };
-type CommandHandler<R, E, A = any> = Effect<R, E, Discord.InteractionResponse> | CommandHandlerFn<R, E, A>;
+export type CommandHandler<R, E, A = any> = Effect<R, E, Discord.InteractionResponse> | CommandHandlerFn<R, E, A>;
 export interface CommandHelper<A> {
     resolve: <T>(name: AllResolvables<A>["name"], f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => T | undefined) => Effect<Discord.Interaction, ResolvedDataNotFound, T>;
     option: (name: AllCommandOptions<A>["name"]) => Effect<Discord.ApplicationCommandDatum, never, Maybe<Discord.ApplicationCommandInteractionDataOption>>;
@@ -70,7 +70,7 @@ export interface CommandHelper<A> {
         };
     }] ? E : never, Discord.InteractionResponse>;
 }
-type CommandHandlerFn<R, E, A> = (i: CommandHelper<A>) => Effect<R, E, Discord.InteractionResponse>;
+export type CommandHandlerFn<R, E, A> = (i: CommandHelper<A>) => Effect<R, E, Discord.InteractionResponse>;
 interface CommandOption {
     readonly type: any;
     readonly name: string;

package/Interactions/gateway.d.ts

@@ -1,4 +1,4 @@
-import { Effect, Discord } from "dfx/_common";
+import { Effect, Discord, Cause } from "dfx/_common";
 import * as Http from "@effect-http/client";
 import { DiscordGateway } from "dfx/DiscordGateway";
 import { DiscordREST, DiscordRESTError } from "dfx/DiscordREST";
@@ -11,10 +11,10 @@ export interface RunOpts {
  * @tsplus pipeable dfx/InteractionBuilder runGateway
  * @tsplus location "dfx/Interactions/gateway"
  */
-export declare const run: <R, R2, E, E2>(postHandler: (effect: import("@effect/io/Effect").Effect<R | DiscordREST | import("../types.js").Interaction, E | DiscordRESTError | DefinitionNotFound, void>) => import("@effect/io/Effect").Effect<R2, E2, void>, { sync }?: RunOpts) => (ix: InteractionBuilder<R, E>) => import("@effect/io/Effect").Effect<DiscordREST | DiscordGateway | Exclude<R2, import("../types.js").Interaction>, E2 | DiscordRESTError | Http.ResponseDecodeError, never>;
+export declare const run: <R, R2, E, TE, E2>(postHandler: (effect: import("@effect/io/Effect").Effect<R | DiscordREST | import("../types.js").Interaction, TE | DiscordRESTError | DefinitionNotFound, void>) => import("@effect/io/Effect").Effect<R2, E2, void>, { sync }?: RunOpts) => (ix: InteractionBuilder<R, E, TE>) => import("@effect/io/Effect").Effect<DiscordREST | DiscordGateway | Exclude<R2, import("../types.js").Interaction>, E2 | DiscordRESTError | Http.ResponseDecodeError, never>;
 export interface InteractionsRegistry {
-    readonly register: (ix: InteractionBuilder<never, never>) => Effect<never, never, void>;
-    readonly run: Effect<DiscordREST | DiscordGateway, DiscordRESTError | Http.ResponseDecodeError, never>;
+    readonly register: <E>(ix: InteractionBuilder<never, E, never>) => Effect<never, never, void>;
+    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>;
 }
 export declare const InteractionsRegistry: import("@effect/data/Context").Tag<InteractionsRegistry, InteractionsRegistry>;
 export declare const InteractionsRegistryLive: import("@effect-http/client/_common").Layer<never, never, InteractionsRegistry>;

package/Interactions/gateway.js

@@ -1,35 +1,39 @@
 import * as tsplus_module_1 from "@effect/io/Effect";
-import * as tsplus_module_2 from "@effect/data/Function";
-import * as tsplus_module_3 from "@effect/io/Ref";
-import * as tsplus_module_4 from "dfx/_common";
+import * as tsplus_module_2 from "@effect/data/Chunk";
+import * as tsplus_module_3 from "dfx/utils/hub";
+import * as tsplus_module_4 from "@effect/io/Ref";
+import * as tsplus_module_5 from "@effect/io/Queue";
+import * as tsplus_module_6 from "dfx/_common";
 import * as Http from "@effect-http/client";
 import { DiscordGateway } from "dfx/DiscordGateway";
 import { DiscordREST } from "dfx/DiscordREST";
 import { handlers } from "./handlers.js";
 import { Interaction, builder } from "./index.js";
-import { splitDefinitions } from "./utils.js";
 /**
  * @tsplus pipeable dfx/InteractionBuilder runGateway
  */
 const run_1 = (postHandler, { sync = true } = {}) => (ix) => (() => {
-    const { GlobalApplicationCommand, GuildApplicationCommand } = splitDefinitions(ix.definitions);
+    const GlobalApplicationCommand = tsplus_module_2.toReadonlyArray(tsplus_module_2.filter(tsplus_module_2.map(ix.definitions, _ => _[0]), (_) => _._tag === "GlobalApplicationCommand"));
+    const GuildApplicationCommand = tsplus_module_2.toReadonlyArray(tsplus_module_2.filter(tsplus_module_2.map(ix.definitions, _ => _[0]), (_) => _._tag === "GuildApplicationCommand"));
     return tsplus_module_1.flatMap(DiscordGateway, gateway => tsplus_module_1.flatMap(DiscordREST, rest => tsplus_module_1.flatMap(tsplus_module_1.flatMap(rest.getCurrentBotApplicationInformation(), a => a.json), application => {
-        const globalSync = rest.bulkOverwriteGlobalApplicationCommands(application.id, { body: Http.body.json(GlobalApplicationCommand.map(a => a.command)) });
+        const globalSync = rest.bulkOverwriteGlobalApplicationCommands(application.id, {
+            body: Http.body.json(GlobalApplicationCommand.map(_ => _.command)),
+        });
         const guildSync = GuildApplicationCommand.length
-            ? gateway.handleDispatch("GUILD_CREATE", a => rest.bulkOverwriteGuildApplicationCommands(application.id, a.id, GuildApplicationCommand.map(a => a.command)))
+            ? gateway.handleDispatch("GUILD_CREATE", a => rest.bulkOverwriteGuildApplicationCommands(application.id, a.id, GuildApplicationCommand.map(_ => _.command)))
             : tsplus_module_1.never();
-        const handle = handlers(ix.definitions);
-        const run = gateway.handleDispatch("INTERACTION_CREATE", i => tsplus_module_1.provideService(tsplus_module_2.pipe(tsplus_module_1.tap(ix
-            .transformRespond(handle[i.type](i)), r => rest.createInteractionResponse(i.id, i.token, r)), ix.transform, postHandler), Interaction, i));
+        const handle = handlers(ix.definitions, (i, r) => rest.createInteractionResponse(i.id, i.token, r));
+        const run = gateway.handleDispatch("INTERACTION_CREATE", i => tsplus_module_1.provideService(postHandler(handle[i.type](i)), Interaction, i));
         return sync ? tsplus_module_1.zipParRight(tsplus_module_1.zipParRight(run, globalSync), guildSync) : run;
     })));
 })();
 export const run = run_1;
-const makeRegistry = tsplus_module_1.map(tsplus_module_3.make(builder), ref => {
-    const register = (ix) => tsplus_module_3.update(ref, _ => _.concat(ix));
-    const run = tsplus_module_1.flatMap(tsplus_module_3.get(ref), _ => run_1(_ => tsplus_module_1.catchAllCause(_, _ => tsplus_module_1.logErrorCause(_)))(_));
+const makeRegistry = tsplus_module_1.flatMap(tsplus_module_4.make(builder), ref => tsplus_module_1.map(tsplus_module_5.unbounded(), queue => {
+    const register = (ix) => tsplus_module_1.flatMap(tsplus_module_4.updateAndGet(ref, _ => _.concat(ix)), _ => queue.offer(_));
+    const run = (onError, opts) => tsplus_module_3.foreverSwitch(queue
+        .take(), _ => run_1(_ => tsplus_module_1.catchAllCause(_, onError), opts)(_));
     return { register, run };
-});
-export const InteractionsRegistry = tsplus_module_4.Tag();
+}));
+export const InteractionsRegistry = tsplus_module_6.Tag();
 export const InteractionsRegistryLive = tsplus_module_1.toLayer(makeRegistry, InteractionsRegistry);
 //# sourceMappingURL=gateway.js.map

package/Interactions/gateway.js.map

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

package/Interactions/handlers.d.ts

@@ -1,10 +1,10 @@
-import { Discord, Effect } from "dfx/_common";
+import { Discord, Effect, Chunk } from "dfx/_common";
 import * as D from "./definitions.js";
 export declare class DefinitionNotFound {
     readonly interaction: Discord.Interaction;
     readonly _tag = "DefinitionNotFound";
     constructor(interaction: Discord.Interaction);
 }
-type Handler<R, E> = Effect<R | Discord.Interaction, E | DefinitionNotFound, Discord.InteractionResponse>;
-export declare const handlers: <R, E>(definitions: D.InteractionDefinition<R, E>[]) => Record<import("../types.js").InteractionType, (i: Discord.Interaction) => Handler<R, E>>;
+type Handler<R, E, A> = Effect<R | Discord.Interaction, E | DefinitionNotFound, A>;
+export declare const handlers: <R, E, TE, A, B>(definitions: import("../_common.js").Chunk<readonly [handler: D.InteractionDefinition<R, E>, transform: (self: import("@effect/io/Effect").Effect<R, E, A>) => import("@effect/io/Effect").Effect<R, TE, B>]>, handleResponse: (ix: Discord.Interaction, _: Discord.InteractionResponse) => import("@effect/io/Effect").Effect<R, E, A>) => Record<import("../types.js").InteractionType, (i: Discord.Interaction) => Handler<R, E, B>>;
 export {};

package/Interactions/handlers.js

@@ -1,11 +1,9 @@
 import * as tsplus_module_1 from "dfx/_common";
 import * as tsplus_module_2 from "@effect/io/Effect";
 import * as tsplus_module_3 from "@effect/data/Option";
-import * as tsplus_module_4 from "@effect/data/Function";
-import * as Arr from "@effect/data/ReadonlyArray";
 import * as IxHelpers from "dfx/Helpers/interactions";
 import * as Ctx from "./context.js";
-import { splitDefinitions } from "./utils.js";
+import { flattenDefinitions, splitDefinitions } from "./utils.js";
 export class DefinitionNotFound {
     interaction;
     _tag = "DefinitionNotFound";
@@ -13,45 +11,34 @@ export class DefinitionNotFound {
         this.interaction = interaction;
     }
 }
-const context = {
-    resolve: Ctx.resolved,
-    option: Ctx.option,
-    optionValue: Ctx.optionValue,
-    optionValueOptional: Ctx.optionValueOptional,
-    subCommands: Ctx.handleSubCommands,
-};
-export const handlers = (definitions) => {
-    const { Commands, Autocomplete, MessageComponent, ModalSubmit } = splitDefinitions(definitions);
+export const handlers = (definitions, handleResponse) => {
+    const flattened = flattenDefinitions(definitions, handleResponse);
+    const { Commands, Autocomplete, MessageComponent, ModalSubmit } = splitDefinitions(flattened);
     return {
         [1 /* Discord.InteractionType.PING */]: () => tsplus_module_2.succeed({
             type: 1 /* Discord.InteractionCallbackType.PONG */,
         }),
         [2 /* Discord.InteractionType.APPLICATION_COMMAND */]: i => {
             const data = i.data;
-            return tsplus_module_2.provideService(tsplus_module_3.match(tsplus_module_3.fromNullable(Commands[data.name]), () => tsplus_module_2.fail(new DefinitionNotFound(i)), command => tsplus_module_2.isEffect(command.handle)
-                ? command.handle
-                : command.handle(context)), Ctx.ApplicationCommand, data);
+            return tsplus_module_3.match(tsplus_module_3.fromNullable(Commands[data.name]), () => tsplus_module_2.fail(new DefinitionNotFound(i)), command => tsplus_module_2.provideService(command
+                .handle(i), Ctx.ApplicationCommand, data));
         },
-        [5 /* Discord.InteractionType.MODAL_SUBMIT */]: (i) => {
+        [5 /* Discord.InteractionType.MODAL_SUBMIT */]: i => {
             const data = i.data;
-            return tsplus_module_4.pipe(ModalSubmit, Arr.map(a => tsplus_module_2.all({
-                command: tsplus_module_2.succeed(a),
-                match: a.predicate(data.custom_id),
-            })), _ => tsplus_module_2.provideService(tsplus_module_2.flatMap(tsplus_module_2.allPar(_), _ => tsplus_module_3.match(Arr.findFirst(_, _ => _.match), () => tsplus_module_2.fail(new DefinitionNotFound(i)), a => a.command.handle)), Ctx.ModalSubmitData, data));
+            return tsplus_module_2.flatMap(tsplus_module_2.find(ModalSubmit, _ => _.predicate(data.custom_id)), _ => tsplus_module_3.match(_, () => tsplus_module_2.fail(new DefinitionNotFound(i)), match => tsplus_module_2.provideService(match
+                .handle(i), Ctx.ModalSubmitData, data)));
         },
         [3 /* Discord.InteractionType.MESSAGE_COMPONENT */]: i => {
             const data = i.data;
-            return tsplus_module_4.pipe(MessageComponent, Arr.map(a => tsplus_module_2.all({
-                command: tsplus_module_2.succeed(a),
-                match: a.predicate(data.custom_id),
-            })), _ => tsplus_module_2.provideService(tsplus_module_2.flatMap(tsplus_module_2.allPar(_), commands => tsplus_module_3.match(Arr.findFirst(commands, _ => _.match), () => tsplus_module_2.fail(new DefinitionNotFound(i)), _ => _.command.handle)), Ctx.MessageComponentData, data));
+            return tsplus_module_2.flatMap(tsplus_module_2.find(MessageComponent, _ => _.predicate(data.custom_id)), _ => tsplus_module_3.match(_, () => tsplus_module_2.fail(new DefinitionNotFound(i)), match => tsplus_module_2.provideService(match
+                .handle(i), Ctx.MessageComponentData, data)));
         },
         [4 /* Discord.InteractionType.APPLICATION_COMMAND_AUTOCOMPLETE */]: i => {
             const data = i.data;
-            return tsplus_module_3.getOrElse(tsplus_module_3.map(IxHelpers.focusedOption(data), focusedOption => tsplus_module_4.pipe(Autocomplete, Arr.map(_ => tsplus_module_2.all({
-                command: tsplus_module_2.succeed(_),
-                match: _.predicate(data, focusedOption),
-            })), _ => tsplus_module_2.provideService(tsplus_module_2.provideService(tsplus_module_2.flatMap(tsplus_module_2.allPar(_), _ => tsplus_module_3.match(Arr.findFirst(_, _ => _.match), () => tsplus_module_2.fail(new DefinitionNotFound(i)), _ => _.command.handle)), Ctx.ApplicationCommand, data), Ctx.FocusedOptionContext, { focusedOption }))), () => tsplus_module_2.fail(new DefinitionNotFound(i)));
+            return tsplus_module_3.match(IxHelpers.focusedOption(data), () => tsplus_module_2.fail(new DefinitionNotFound(i)), focusedOption => tsplus_module_2.flatMap(tsplus_module_2.find(Autocomplete, _ => _.predicate(data, focusedOption)), _ => tsplus_module_3.match(_, () => tsplus_module_2.fail(new DefinitionNotFound(i)), match => tsplus_module_2.provideService(tsplus_module_2.provideService(match
+                .handle(i), Ctx.ApplicationCommand, data), Ctx.FocusedOptionContext, {
+                focusedOption,
+            }))));
         },
     };
 };

package/Interactions/handlers.js.map

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

package/Interactions/index.d.ts

@@ -1,42 +1,8 @@
-import { Cause } from "dfx/_common";
-import * as Http from "@effect-http/client";
-import { DiscordREST } from "dfx";
 import { Discord, Effect } from "dfx/_common";
-import * as D from "./definitions.js";
 export { response } from "../Helpers/interactions.js";
+export * from "./builder.js";
 export * from "./context.js";
 export { InteractionDefinition, autocomplete, global, guild, messageComponent, modalSubmit, } from "./definitions.js";
-type ExtractTag<A> = A extends {
-    _tag: infer Tag;
-} ? Tag extends string ? Tag : never : never;
-/**
- * @tsplus type dfx/InteractionBuilder
- */
-export declare class InteractionBuilder<R, E> {
-    readonly definitions: D.InteractionDefinition<R, E>[];
-    readonly transform: (self: Effect<any, any, any>) => Effect<R, E, void>;
-    readonly transformRespond: (self: Effect<any, any, Discord.InteractionResponse>) => Effect<R, E, Discord.InteractionResponse>;
-    constructor(definitions: D.InteractionDefinition<R, E>[], transform: (self: Effect<any, any, any>) => Effect<R, E, void>, transformRespond: (self: Effect<any, any, Discord.InteractionResponse>) => Effect<R, E, Discord.InteractionResponse>);
-    add<R1, E1>(definition: D.InteractionDefinition<R1, E1>): InteractionBuilder<R | R1, E | E1>;
-    concat<R1, E1>(builder: InteractionBuilder<R1, E1>): InteractionBuilder<R | R1, E | E1>;
-    catchAllCause<R1, E1>(f: (cause: Cause<E>) => Effect<R1, E1, void>): InteractionBuilder<R | R1, E1>;
-    catchAllCauseRespond<R1, E1>(f: (cause: Cause<E>) => Effect<R1, E1, Discord.InteractionResponse>): InteractionBuilder<R | R1, E1>;
-    catchAll<R1, E1>(f: (error: E) => Effect<R1, E1, void>): InteractionBuilder<R | R1, E1>;
-    catchAllRespond<R1, E1>(f: (error: E) => Effect<R1, E1, Discord.InteractionResponse>): InteractionBuilder<R | R1, E1>;
-    catchTag<T extends ExtractTag<E>, R1, E1>(tag: T, f: (error: Extract<E, {
-        _tag: T;
-    }>) => Effect<R1, E1, void>): InteractionBuilder<R | R1, E1 | Exclude<E, {
-        _tag: T;
-    }>>;
-    catchTagRespond<T extends ExtractTag<E>, R1, E1>(tag: T, f: (error: Extract<E, {
-        _tag: T;
-    }>) => Effect<R1, E1, Discord.InteractionResponse>): InteractionBuilder<R | R1, E1 | Exclude<E, {
-        _tag: T;
-    }>>;
-    get syncGlobal(): Effect<DiscordREST, import("../DiscordREST.js").DiscordRESTError | Http.ResponseDecodeError, import("../DiscordREST/types.js").ResponseWithData<Discord.ApplicationCommand[]>>;
-    syncGuild(appId: Discord.Snowflake, guildId: Discord.Snowflake): Effect<DiscordREST, import("../DiscordREST.js").DiscordRESTError, import("../DiscordREST/types.js").ResponseWithData<Discord.ApplicationCommand[]>>;
-}
-export declare const builder: InteractionBuilder<never, never>;
 export declare const id: (query: string) => (customId: string) => Effect<never, never, boolean>;
 export declare const idStartsWith: (query: string) => (customId: string) => Effect<never, never, boolean>;
 export declare const idRegex: (query: RegExp) => (customId: string) => Effect<never, never, boolean>;

package/Interactions/index.js

@@ -1,64 +1,8 @@
 import * as tsplus_module_1 from "@effect/io/Effect";
-import * as tsplus_module_2 from "@effect/data/Function";
-import * as Http from "@effect-http/client";
-import { catchTag } from "@effect/io/Effect";
-import { DiscordREST } from "dfx";
 export { response } from "../Helpers/interactions.js";
+export * from "./builder.js";
 export * from "./context.js";
 export { autocomplete, global, guild, messageComponent, modalSubmit, } from "./definitions.js";
-/**
- * @tsplus type dfx/InteractionBuilder
- */
-export class InteractionBuilder {
-    definitions;
-    transform;
-    transformRespond;
-    constructor(definitions, transform, transformRespond) {
-        this.definitions = definitions;
-        this.transform = transform;
-        this.transformRespond = transformRespond;
-    }
-    add(definition) {
-        return new InteractionBuilder([...this.definitions, definition], this.transform, this.transformRespond);
-    }
-    concat(builder) {
-        return new InteractionBuilder([...this.definitions, ...builder.definitions], this.transform, this.transformRespond);
-    }
-    catchAllCause(f) {
-        return new InteractionBuilder(this.definitions, _ => tsplus_module_1.catchAllCause(this.transform(_), f), this.transformRespond);
-    }
-    catchAllCauseRespond(f) {
-        return new InteractionBuilder(this.definitions, this.transform, _ => tsplus_module_1.catchAllCause(this.transformRespond(_), f));
-    }
-    catchAll(f) {
-        return new InteractionBuilder(this.definitions, _ => tsplus_module_1.catchAll(this.transform(_), f), this.transformRespond);
-    }
-    catchAllRespond(f) {
-        return new InteractionBuilder(this.definitions, this.transform, _ => tsplus_module_1.catchAll(this.transformRespond(_), f));
-    }
-    catchTag(tag, f) {
-        return new InteractionBuilder(this.definitions, _ => catchTag(this.transform(_), tag, f), this.transformRespond);
-    }
-    catchTagRespond(tag, f) {
-        return new InteractionBuilder(this.definitions, this.transform, _ => catchTag(this.transformRespond(_), tag, f));
-    }
-    get syncGlobal() {
-        const commands = this.definitions
-            .filter((c) => c._tag === "GlobalApplicationCommand")
-            .map(c => c.command);
-        return tsplus_module_1.flatMap(DiscordREST, rest => tsplus_module_1.flatMap(tsplus_module_1.flatMap(rest
-            .getCurrentBotApplicationInformation(), r => r.json), app => rest.bulkOverwriteGlobalApplicationCommands(app.id, {
-            body: Http.body.json(commands),
-        })));
-    }
-    syncGuild(appId, guildId) {
-        const commands = this.definitions
-            .filter((c) => c._tag === "GuildApplicationCommand")
-            .map(c => c.command);
-        return tsplus_module_1.flatMap(DiscordREST, rest => rest.bulkOverwriteGuildApplicationCommands(appId, guildId, commands));
-    }
-}
-export const builder = new InteractionBuilder([], tsplus_module_2.identity, tsplus_module_2.identity);
 // Filters
 export const id = (query) => (customId) => tsplus_module_1.succeed(query === customId);
 export const idStartsWith = (query) => (customId) => tsplus_module_1.succeed(customId.startsWith(query));

package/Interactions/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/Interactions/index.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,IAAI,MAAM,qBAAqB,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,KAAK,CAAA;AAIjC,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AACrD,cAAc,cAAc,CAAA;AAC5B,OAAO,EAEL,YAAY,EACZ,MAAM,EACN,KAAK,EACL,gBAAgB,EAChB,WAAW,GACZ,MAAM,kBAAkB,CAAA;AAQzB;;GAEG;AACH,MAAM,OAAO,kBAAkB;IAElB;IACA;IACA;IAHX,YACW,WAA4C,EAC5C,SAA8D,EAC9D,gBAEqC;QAJrC,gBAAW,GAAX,WAAW,CAAiC;QAC5C,cAAS,GAAT,SAAS,CAAqD;QAC9D,qBAAgB,GAAhB,gBAAgB,CAEqB;IAC7C,CAAC;IAEJ,GAAG,CAAS,UAA2C;QACrD,OAAO,IAAI,kBAAkB,CAC3B,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,EACjC,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,gBAAgB,CACtB,CAAA;IACH,CAAC;IAED,MAAM,CAAS,OAAmC;QAChD,OAAO,IAAI,kBAAkB,CAC3B,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,EAC7C,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,gBAAgB,CACtB,CAAA;IACH,CAAC;IAED,aAAa,CAAS,CAA4C;QAChE,OAAO,IAAI,kBAAkB,CAC3B,IAAI,CAAC,WAAkB,EACvB,CAAC,CAAC,EAAE,CAAC,8BAAA,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAe,CAAC,CAAC,EACvC,IAAI,CAAC,gBAAuB,CAC7B,CAAA;IACH,CAAC;IAED,oBAAoB,CAClB,CAAmE;QAEnE,OAAO,IAAI,kBAAkB,CAC3B,IAAI,CAAC,WAAkB,EACvB,IAAI,CAAC,SAAgB,EACrB,CAAC,CAAC,EAAE,CAAC,8BAAA,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAe,CAAC,CAAC,CAC/C,CAAA;IACH,CAAC;IAED,QAAQ,CAAS,CAAqC;QACpD,OAAO,IAAI,kBAAkB,CAC3B,IAAI,CAAC,WAAkB,EACvB,CAAC,CAAC,EAAE,CAAC,yBAAA,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAU,CAAC,CAAC,EAClC,IAAI,CAAC,gBAAuB,CAC7B,CAAA;IACH,CAAC;IAED,eAAe,CACb,CAA4D;QAE5D,OAAO,IAAI,kBAAkB,CAC3B,IAAI,CAAC,WAAkB,EACvB,IAAI,CAAC,SAAgB,EACrB,CAAC,CAAC,EAAE,CAAC,yBAAA,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAU,CAAC,CAAC,CAC1C,CAAA;IACH,CAAC;IAED,QAAQ,CACN,GAAM,EACN,CAA2D;QAE3D,OAAO,IAAI,kBAAkB,CAC3B,IAAI,CAAC,WAAkB,EACvB,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAQ,EAAE,GAAG,EAAE,CAAQ,CAAQ,EAC7D,IAAI,CAAC,gBAAuB,CAC7B,CAAA;IACH,CAAC;IAED,eAAe,CACb,GAAM,EACN,CAEgD;QAEhD,OAAO,IAAI,kBAAkB,CAC3B,IAAI,CAAC,WAAkB,EACvB,IAAI,CAAC,SAAgB,EACrB,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAQ,EAAE,GAAG,EAAE,CAAQ,CAAQ,CACrE,CAAA;IACH,CAAC;IAED,IAAI,UAAU;QACZ,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW;aAC9B,MAAM,CACL,CAAC,CAAC,EAAyC,EAAE,CAC3C,CAAC,CAAC,IAAI,KAAK,0BAA0B,CACxC;aACA,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QAEtB,OAAO,wBAAA,WAAW,EAAS,IAAI,CAAC,EAAE,CAChC,wBAAA,wBAAA,IAAI;aACD,mCAAmC,EAAE,EAC7B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EACZ,GAAG,CAAC,EAAE,CACb,IAAI,CAAC,sCAAsC,CAAC,GAAG,CAAC,EAAE,EAAE;YAClD,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;SAC/B,CAAC,CACH,CACJ,CAAA;IACH,CAAC;IAED,SAAS,CAAC,KAAwB,EAAE,OAA0B;QAC5D,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW;aAC9B,MAAM,CACL,CAAC,CAAC,EAAwC,EAAE,CAC1C,CAAC,CAAC,IAAI,KAAK,yBAAyB,CACvC;aACA,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QAEtB,OAAO,wBAAA,WAAW,EAAS,IAAI,CAAC,EAAE,CAChC,IAAI,CAAC,qCAAqC,CACxC,KAAK,EACL,OAAO,EACP,QAAe,CAChB,CACF,CAAA;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,kBAAkB,CAC3C,EAAE,EACF,gBAAA,QAAe,EACf,gBAAA,QAAe,CAChB,CAAA;AAED,UAAU;AACV,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,QAAgB,EAAE,EAAE,CACxD,wBAAe,KAAK,KAAK,QAAQ,CAAC,CAAA;AAEpC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,QAAgB,EAAE,EAAE,CAClE,wBAAe,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAA;AAE5C,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,QAAgB,EAAE,EAAE,CAC7D,wBAAe,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;AAEtC,MAAM,CAAC,MAAM,MAAM,GACjB,CAAC,OAAe,EAAE,UAAkB,EAAE,EAAE,CACxC,CACE,IAAmD,EACnD,aAGC,EACD,EAAE,CACF,wBAAe,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;AAE9E,MAAM,CAAC,MAAM,UAAU,GACrB,CAAC,UAAkB,EAAE,EAAE,CACvB,CACE,CAAU,EACV,aAGC,EACD,EAAE,CACF,wBAAe,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/Interactions/index.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AACrD,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,OAAO,EAEL,YAAY,EACZ,MAAM,EACN,KAAK,EACL,gBAAgB,EAChB,WAAW,GACZ,MAAM,kBAAkB,CAAA;AAEzB,UAAU;AACV,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,QAAgB,EAAE,EAAE,CACxD,wBAAe,KAAK,KAAK,QAAQ,CAAC,CAAA;AAEpC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,QAAgB,EAAE,EAAE,CAClE,wBAAe,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAA;AAE5C,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,QAAgB,EAAE,EAAE,CAC7D,wBAAe,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;AAEtC,MAAM,CAAC,MAAM,MAAM,GACjB,CAAC,OAAe,EAAE,UAAkB,EAAE,EAAE,CACxC,CACE,IAAmD,EACnD,aAGC,EACD,EAAE,CACF,wBAAe,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;AAE9E,MAAM,CAAC,MAAM,UAAU,GACrB,CAAC,UAAkB,EAAE,EAAE,CACvB,CACE,CAAU,EACV,aAGC,EACD,EAAE,CACF,wBAAe,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA"}

package/Interactions/utils.d.ts

@@ -1,10 +1,78 @@
+import { Discord, Effect, Chunk } from "dfx/_common";
 import * as D from "./definitions.js";
-export declare const splitDefinitions: <R, E>(definitions: D.InteractionDefinition<R, E>[]) => {
-    Commands: Record<string, D.GlobalApplicationCommand<R, E> | D.GuildApplicationCommand<R, E>>;
-    GlobalApplicationCommand: D.GlobalApplicationCommand<R, E>[];
-    GuildApplicationCommand: D.GuildApplicationCommand<R, E>[];
-    MessageComponent: D.MessageComponent<R, E>[];
-    ModalSubmit: D.ModalSubmit<R, E>[];
-    Autocomplete: D.Autocomplete<R, E>[];
+export type DefinitionFlattened<R, E, TE, A> = D.InteractionDefinition<R, E> extends infer D ? {
+    [K in keyof D]: K extends "handle" ? (_: Discord.Interaction) => Effect<R, TE, A> : D[K];
+} : never;
+export type DefinitionFlattenedCommand<R, E, TE, A> = Extract<DefinitionFlattened<R, E, TE, A>, {
+    _tag: "GlobalApplicationCommand" | "GuildApplicationCommand";
+}>;
+export declare const flattenDefinitions: <R, E, TE, A, B>(definitions: import("../_common.js").Chunk<readonly [handler: D.InteractionDefinition<R, E>, transform: (self: import("@effect/io/Effect").Effect<R, E, A>) => import("@effect/io/Effect").Effect<R, TE, B>]>, handleResponse: (ix: Discord.Interaction, _: Discord.InteractionResponse) => import("@effect/io/Effect").Effect<R, E, A>) => import("../_common.js").Chunk<{
+    handle: (i: Discord.Interaction) => import("@effect/io/Effect").Effect<R, TE, B>;
+    _tag: "GlobalApplicationCommand";
+    command: import("../types.js").CreateGlobalApplicationCommandParams;
+} | {
+    handle: (i: Discord.Interaction) => import("@effect/io/Effect").Effect<R, TE, B>;
+    _tag: "GuildApplicationCommand";
+    command: import("../types.js").CreateGuildApplicationCommandParams;
+} | {
+    handle: (i: Discord.Interaction) => import("@effect/io/Effect").Effect<R, TE, B>;
+    _tag: "MessageComponent";
+    predicate: (customId: string) => import("@effect/io/Effect").Effect<R, E, boolean>;
+} | {
+    handle: (i: Discord.Interaction) => import("@effect/io/Effect").Effect<R, TE, B>;
+    _tag: "ModalSubmit";
+    predicate: (customId: string) => import("@effect/io/Effect").Effect<R, E, boolean>;
+} | {
+    handle: (i: Discord.Interaction) => import("@effect/io/Effect").Effect<R, TE, B>;
+    _tag: "Autocomplete";
+    predicate: (data: import("../types.js").ApplicationCommandDatum, focusedOption: import("../types.js").ApplicationCommandInteractionDataOption) => import("@effect/io/Effect").Effect<R, E, boolean>;
+}>;
+export declare const splitDefinitions: <R, E, TE, A>(definitions: import("../_common.js").Chunk<{
+    readonly _tag: "GlobalApplicationCommand";
+    readonly command: import("../types.js").CreateGlobalApplicationCommandParams;
+    readonly handle: (_: Discord.Interaction) => import("@effect/io/Effect").Effect<R, TE, A>;
+} | {
+    readonly _tag: "GuildApplicationCommand";
+    readonly command: import("../types.js").CreateGuildApplicationCommandParams;
+    readonly handle: (_: Discord.Interaction) => import("@effect/io/Effect").Effect<R, TE, A>;
+} | {
+    readonly _tag: "MessageComponent";
+    readonly predicate: (customId: string) => import("@effect/io/Effect").Effect<R, E, boolean>;
+    readonly handle: (_: Discord.Interaction) => import("@effect/io/Effect").Effect<R, TE, A>;
+} | {
+    readonly _tag: "ModalSubmit";
+    readonly predicate: (customId: string) => import("@effect/io/Effect").Effect<R, E, boolean>;
+    readonly handle: (_: Discord.Interaction) => import("@effect/io/Effect").Effect<R, TE, A>;
+} | {
+    readonly _tag: "Autocomplete";
+    readonly predicate: (data: import("../types.js").ApplicationCommandDatum, focusedOption: import("../types.js").ApplicationCommandInteractionDataOption) => import("@effect/io/Effect").Effect<R, E, boolean>;
+    readonly handle: (_: Discord.Interaction) => import("@effect/io/Effect").Effect<R, TE, A>;
+}>) => {
+    Commands: Record<string, DefinitionFlattenedCommand<R, E, TE, A>>;
+    GlobalApplicationCommand: import("../_common.js").Chunk<{
+        readonly _tag: "GlobalApplicationCommand";
+        readonly command: import("../types.js").CreateGlobalApplicationCommandParams;
+        readonly handle: (_: Discord.Interaction) => import("@effect/io/Effect").Effect<R, TE, A>;
+    }>;
+    GuildApplicationCommand: import("../_common.js").Chunk<{
+        readonly _tag: "GuildApplicationCommand";
+        readonly command: import("../types.js").CreateGuildApplicationCommandParams;
+        readonly handle: (_: Discord.Interaction) => import("@effect/io/Effect").Effect<R, TE, A>;
+    }>;
+    MessageComponent: import("../_common.js").Chunk<{
+        readonly _tag: "MessageComponent";
+        readonly predicate: (customId: string) => import("@effect/io/Effect").Effect<R, E, boolean>;
+        readonly handle: (_: Discord.Interaction) => import("@effect/io/Effect").Effect<R, TE, A>;
+    }>;
+    ModalSubmit: import("../_common.js").Chunk<{
+        readonly _tag: "ModalSubmit";
+        readonly predicate: (customId: string) => import("@effect/io/Effect").Effect<R, E, boolean>;
+        readonly handle: (_: Discord.Interaction) => import("@effect/io/Effect").Effect<R, TE, A>;
+    }>;
+    Autocomplete: import("../_common.js").Chunk<{
+        readonly _tag: "Autocomplete";
+        readonly predicate: (data: import("../types.js").ApplicationCommandDatum, focusedOption: import("../types.js").ApplicationCommandInteractionDataOption) => import("@effect/io/Effect").Effect<R, E, boolean>;
+        readonly handle: (_: Discord.Interaction) => import("@effect/io/Effect").Effect<R, TE, A>;
+    }>;
 };
 export declare function fromHex(hexString: string): Uint8Array;

package/Interactions/utils.js

@@ -1,21 +1,34 @@
+import * as tsplus_module_1 from "@effect/io/Effect";
+import * as tsplus_module_2 from "@effect/data/Chunk";
+import * as Ctx from "./context.js";
+const context = {
+    resolve: Ctx.resolved,
+    option: Ctx.option,
+    optionValue: Ctx.optionValue,
+    optionValueOptional: Ctx.optionValueOptional,
+    subCommands: Ctx.handleSubCommands,
+};
+export const flattenDefinitions = (definitions, handleResponse) => tsplus_module_2.map(definitions, ([definition, transform]) => ({
+    ...definition,
+    handle: (i) => tsplus_module_1.isEffect(definition.handle)
+        ? transform(tsplus_module_1.flatMap(definition.handle, _ => handleResponse(i, _)))
+        : transform(tsplus_module_1.flatMap(definition.handle(context), _ => handleResponse(i, _))),
+}));
 export const splitDefinitions = (definitions) => {
-    const grouped = definitions.reduce((acc, a) => ({
+    const grouped = tsplus_module_2.reduce(definitions, {
+        Autocomplete: tsplus_module_2.empty(),
+        GlobalApplicationCommand: tsplus_module_2.empty(),
+        GuildApplicationCommand: tsplus_module_2.empty(),
+        MessageComponent: tsplus_module_2.empty(),
+        ModalSubmit: tsplus_module_2.empty(),
+    }, (acc, d) => ({
         ...acc,
-        [a._tag]: [...(acc[a._tag] ?? []), a],
-    }), {
-        Autocomplete: [],
-        GlobalApplicationCommand: [],
-        GuildApplicationCommand: [],
-        MessageComponent: [],
-        ModalSubmit: [],
-    });
-    const Commands = [
-        ...grouped.GlobalApplicationCommand,
-        ...grouped.GuildApplicationCommand,
-    ].reduce((acc, a) => ({
+        [d._tag]: tsplus_module_2.append(acc[d._tag], d),
+    }));
+    const Commands = tsplus_module_2.reduce(tsplus_module_2.concat(grouped.GlobalApplicationCommand, grouped.GuildApplicationCommand), {}, (acc, d) => ({
         ...acc,
-        [a.command.name]: a,
-    }), {});
+        [d.command.name]: d,
+    }));
     return {
         ...grouped,
         Commands,