dfx 0.20.0 → 0.20.2

package/Interactions/context.d.ts

@@ -1,17 +1,17 @@
 import { Discord } from "dfx";
 import { Effect, EffectTypeId } from "@effect/io/Effect";
-export declare const InteractionContext: import("../global.js").Tag<import("../types.js").Interaction>;
-export declare const ApplicationCommandContext: import("../global.js").Tag<import("../types.js").ApplicationCommandDatum>;
-export declare const MessageComponentContext: import("../global.js").Tag<import("../types.js").MessageComponentDatum>;
-export declare const ModalSubmitContext: import("../global.js").Tag<import("../types.js").ModalSubmitDatum>;
+export declare const InteractionContext: import("../utils/common.js").Tag<import("../types.js").Interaction>;
+export declare const ApplicationCommandContext: import("../utils/common.js").Tag<import("../types.js").ApplicationCommandDatum>;
+export declare const MessageComponentContext: import("../utils/common.js").Tag<import("../types.js").MessageComponentDatum>;
+export declare const ModalSubmitContext: import("../utils/common.js").Tag<import("../types.js").ModalSubmitDatum>;
 export interface FocusedOptionContext {
     readonly focusedOption: Discord.ApplicationCommandInteractionDataOption;
 }
-export declare const FocusedOptionContext: import("../global.js").Tag<FocusedOptionContext>;
+export declare const FocusedOptionContext: import("../utils/common.js").Tag<FocusedOptionContext>;
 export interface SubCommandContext {
     readonly command: Discord.ApplicationCommandInteractionDataOption;
 }
-export declare const SubCommandContext: import("../global.js").Tag<SubCommandContext>;
+export declare const SubCommandContext: import("../utils/common.js").Tag<SubCommandContext>;
 export declare const interaction: Effect<import("../types.js").Interaction, never, import("../types.js").Interaction>;
 export declare const command: Effect<import("../types.js").ApplicationCommandDatum, never, import("../types.js").ApplicationCommandDatum>;
 export declare class ResolvedDataNotFound {
@@ -38,7 +38,7 @@ export declare const handleSubCommands: <NER extends Record<string, Effect<any,
     };
 }] ? E : never), import("../types.js").InteractionResponse>;
 export declare const currentSubCommand: Effect<SubCommandContext, never, import("../types.js").ApplicationCommandInteractionDataOption>;
-export declare const optionsMap: Effect<import("../types.js").ApplicationCommandDatum, never, import("../global.js").HashMap<string, string | undefined>>;
+export declare const optionsMap: Effect<import("../types.js").ApplicationCommandDatum, never, import("../utils/common.js").HashMap<string, string | undefined>>;
 export declare class RequiredOptionNotFound {
     readonly data: Discord.ApplicationCommandDatum | Discord.ApplicationCommandInteractionDataOption;
     readonly name: string;
@@ -48,4 +48,4 @@ export declare class RequiredOptionNotFound {
 export declare const option: (name: string) => Effect<import("../types.js").ApplicationCommandDatum, never, import("../index.js").Maybe<import("../types.js").ApplicationCommandInteractionDataOption>>;
 export declare const optionValue: (name: string) => Effect<import("../types.js").ApplicationCommandDatum, RequiredOptionNotFound, string>;
 export declare const optionValueOptional: (name: string) => Effect<import("../types.js").ApplicationCommandDatum, never, import("../index.js").Maybe<string>>;
-export declare const modalValues: Effect<import("../types.js").ModalSubmitDatum, never, import("../global.js").HashMap<string, string | undefined>>;
+export declare const modalValues: Effect<import("../types.js").ModalSubmitDatum, never, import("../utils/common.js").HashMap<string, string | undefined>>;

package/Interactions/context.js

@@ -1,7 +1,6 @@
-import * as tsplus_module_1 from "@fp-ts/data/Context";
+import * as tsplus_module_1 from "dfx/utils/common";
 import * as tsplus_module_2 from "@effect/io/Effect";
 import * as tsplus_module_3 from "@fp-ts/data/Option";
-import * as tsplus_module_4 from "@fp-ts/data/Function";
 import { EffectTypeId } from "@effect/io/Effect";
 import * as Arr from "@fp-ts/data/ReadonlyArray";
 import * as IxHelpers from "../Helpers/interactions.js";
@@ -32,7 +31,7 @@ export class SubCommandNotFound {
         this.data = data;
     }
 }
-export const handleSubCommands = (commands) => tsplus_module_2.flatMap((data) => tsplus_module_4.pipe(IxHelpers.allSubCommands(data), Arr.findFirst((a) => !!commands[a.name]), (o) => tsplus_module_3.toEither(() => new SubCommandNotFound(data))(o), tsplus_module_2.fromEither, (a) => tsplus_module_2.flatMap((command) => tsplus_module_4.pipe(commands[command.name], tsplus_module_2.provideService(SubCommandContext)({ command })))(a)))(tsplus_module_2.service(ApplicationCommandContext));
+export const handleSubCommands = (commands) => tsplus_module_2.flatMap((data) => tsplus_module_1.pipe(IxHelpers.allSubCommands(data), Arr.findFirst((a) => !!commands[a.name]), (o) => tsplus_module_3.toEither(() => new SubCommandNotFound(data))(o), tsplus_module_2.fromEither, (a) => tsplus_module_2.flatMap((command) => tsplus_module_1.pipe(commands[command.name], tsplus_module_2.provideService(SubCommandContext)({ command })))(a)))(tsplus_module_2.service(ApplicationCommandContext));
 export const currentSubCommand = tsplus_module_2.serviceWith(SubCommandContext)((a) => a.command);
 export const optionsMap = tsplus_module_2.serviceWith(ApplicationCommandContext)(IxHelpers.optionsMap);
 export class RequiredOptionNotFound {

package/Interactions/context.js.map

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

package/Interactions/definitions.d.ts

@@ -1,4 +1,5 @@
-import { Discord, Maybe } from "dfx";
+import { Discord } from "dfx";
+import { Maybe } from "dfx/utils/common";
 import { Effect, EffectTypeId } from "@effect/io/Effect";
 import { FocusedOptionContext, ResolvedDataNotFound, SubCommandContext } from "./context.js";
 import type { F } from "ts-toolbelt";

package/Interactions/gateway.d.ts

@@ -1,8 +1,12 @@
-import { Effect } from "@effect/io/Effect";
+import { Effect } from "dfx/utils/common";
 import { DiscordREST, Discord, FetchError, StatusCodeError, JsonParseError } from "dfx";
 import { DefinitionNotFound } from "./handlers.js";
 import { InteractionBuilder } from "./index.js";
 export interface RunOpts {
     sync?: boolean;
 }
-export declare const run: <R, R2, E, E2>(postHandler: (effect: import("../global.js").Effect<import("../index.js").DiscordREST | import("../types.js").Interaction | R, import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError | DefinitionNotFound | E, void>) => import("../global.js").Effect<R2, E2, void>, { sync }?: RunOpts) => (ix: InteractionBuilder<R, E>) => import("../global.js").Effect<import("../index.js").DiscordREST | import("../DiscordGateway/index.js").DiscordGateway | Exclude<R2, import("../types.js").Interaction>, import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError | E2, void>;
+/**
+ * @tsplus pipeable dfx/InteractionBuilder runGateway
+ * @tsplus location "dfx/Interactions/gateway"
+ */
+export declare const run: <R, R2, E, E2>(postHandler: (effect: import("../utils/common.js").Effect<R | import("../index.js").DiscordREST | import("../types.js").Interaction, E | import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError | DefinitionNotFound, void>) => import("../utils/common.js").Effect<R2, E2, void>, { sync }?: RunOpts) => (ix: InteractionBuilder<R, E>) => import("../utils/common.js").Effect<import("../index.js").DiscordREST | import("../DiscordGateway/index.js").DiscordGateway | Exclude<R2, import("../types.js").Interaction>, E2 | import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError, void>;

package/Interactions/gateway.js

@@ -1,10 +1,13 @@
 import * as tsplus_module_1 from "@effect/io/Effect";
-import * as tsplus_module_2 from "@fp-ts/data/Function";
+import * as tsplus_module_2 from "dfx/utils/common";
 import * as tsplus_module_3 from "dfx";
 import * as tsplus_module_4 from "dfx/gateway";
 import { handlers } from "./handlers.js";
 import { InteractionContext } from "./index.js";
 import { splitDefinitions } from "./utils.js";
+/**
+ * @tsplus pipeable dfx/InteractionBuilder runGateway
+ */
 export const run = (postHandler, { sync = true } = {}) => (ix) => (() => {
     const { GlobalApplicationCommand, GuildApplicationCommand } = splitDefinitions(ix.definitions);
     return tsplus_module_1.flatMap(gateway => tsplus_module_1.flatMap(rest => tsplus_module_1.flatMap(application => {

package/Interactions/gateway.js.map

@@ -1 +1 @@
-{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../src/Interactions/gateway.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAsB,QAAQ,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,EAAsB,kBAAkB,EAAE,MAAM,YAAY,CAAA;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAM7C,MAAM,CAAC,MAAM,GAAG,GACd,CACE,WAMyB,EACzB,EAAE,IAAI,GAAG,IAAI,KAAc,EAAE,EAC7B,EAAE,CACJ,CAAC,EAA4B,EAAE,EAAE;IAE7B,MAAM,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,GACzD,gBAAgB,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;mCAE5B,OAAO,4BACP,IAAI,4BAEJ,WAAW;QAIjB,MAAM,UAAU,GAAG,IAAI,CAAC,sCAAsC,CAC5D,WAAW,CAAC,EAAE,EACd;YACE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;SACrE,CACF,CAAA;QAED,MAAM,SAAS,GAAG,uBAAuB,CAAC,MAAM;YAC9C,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE,CAC3C,IAAI,CAAC,qCAAqC,CACxC,WAAW,CAAC,EAAE,EACd,CAAC,CAAC,EAAE,EACJ,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAQ,CACrD,CACF;YACH,CAAC,CAAC,sBAAa,CAAA;QAEjB,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;QAEvC,MAAM,GAAG,GAAG,OAAO,CAAC,cAAc,CAAC,oBAAoB,EAAE,CAAC,CAAC,EAAE,EAAE,CAC7D,gBAAA,IAAI,CACF,oBAAsB,CAAC,CAAC,EAAE,EAAE,CAC1B,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,EADlD,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAEhB,EACD,WAAW,EACX,+BAAsB,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAC7C,CACF,CAAA;iDAEC,IAAI,CAAC,CAAC,CAAC,uBAA8B,SAAS,EAAvC,uBAAW,UAAU,EAArB,GAAG,CAAmB,CAAkB,CAAC,CAAC,CAAC,GAAG;OAhCrD,wBAAmD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAhE,IAAI,CAAC,mCAAmC,EAAE,CAAuB,GAHpD,wCAAe,WAAW,CAAC,GADxB,wBAAe,gBAAA,OAAO,CAAC,cAAc,CAAC;IAqCxD,CAAA"}
+{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../src/Interactions/gateway.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAsB,QAAQ,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,EAAsB,kBAAkB,EAAE,MAAM,YAAY,CAAA;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAM7C;;GAEG;AACH,MAAM,CAAC,MAAM,GAAG,GACd,CACE,WAMyB,EACzB,EAAE,IAAI,GAAG,IAAI,KAAc,EAAE,EAC7B,EAAE,CACJ,CAAC,EAA4B,EAAE,EAAE;IAE7B,MAAM,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,GACzD,gBAAgB,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;mCAE5B,OAAO,4BACP,IAAI,4BAEJ,WAAW;QAIjB,MAAM,UAAU,GAAG,IAAI,CAAC,sCAAsC,CAC5D,WAAW,CAAC,EAAE,EACd;YACE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;SACrE,CACF,CAAA;QAED,MAAM,SAAS,GAAG,uBAAuB,CAAC,MAAM;YAC9C,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE,CAC3C,IAAI,CAAC,qCAAqC,CACxC,WAAW,CAAC,EAAE,EACd,CAAC,CAAC,EAAE,EACJ,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAQ,CACrD,CACF;YACH,CAAC,CAAC,sBAAa,CAAA;QAEjB,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;QAEvC,MAAM,GAAG,GAAG,OAAO,CAAC,cAAc,CAAC,oBAAoB,EAAE,CAAC,CAAC,EAAE,EAAE,CAC7D,gBAAA,IAAI,CACF,oBAAsB,CAAC,CAAC,EAAE,EAAE,CAC1B,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,EADlD,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAEhB,EACD,WAAW,EACX,+BAAsB,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAC7C,CACF,CAAA;iDAEC,IAAI,CAAC,CAAC,CAAC,uBAA8B,SAAS,EAAvC,uBAAW,UAAU,EAArB,GAAG,CAAmB,CAAkB,CAAC,CAAC,CAAC,GAAG;OAhCrD,wBAAmD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAhE,IAAI,CAAC,mCAAmC,EAAE,CAAuB,GAHpD,wCAAe,WAAW,CAAC,GADxB,wBAAe,gBAAA,OAAO,CAAC,cAAc,CAAC;IAqCxD,CAAA"}

package/Interactions/handlers.d.ts

@@ -1,5 +1,5 @@
 import { Discord } from "dfx";
-import { Effect } from "@effect/io/Effect";
+import { Effect } from "dfx/utils/common";
 import * as D from "./definitions.js";
 export declare class DefinitionNotFound {
     readonly interaction: Discord.Interaction;

package/Interactions/handlers.js

@@ -1,7 +1,7 @@
 import * as tsplus_module_1 from "dfx";
 import * as tsplus_module_2 from "@effect/io/Effect";
 import * as tsplus_module_3 from "@fp-ts/data/Option";
-import * as tsplus_module_4 from "@fp-ts/data/Function";
+import * as tsplus_module_4 from "dfx/utils/common";
 import * as tsplus_module_5 from "@fp-ts/data/Chunk";
 import * as Ctx from "./context.js";
 import * as Arr from "@fp-ts/data/ReadonlyArray";

package/Interactions/index.d.ts

@@ -1,20 +1,23 @@
-import { Effect } from "@effect/io/Effect";
+import { Effect } from "dfx/utils/common";
 import { DiscordREST, Discord } from "dfx";
 import * as D from "./definitions.js";
 export * from "./context.js";
 export { global, guild, messageComponent, modalSubmit, autocomplete, InteractionDefinition, } from "./definitions.js";
 export { response as r } from "../Helpers/interactions.js";
+/**
+ * @tsplus type dfx/InteractionBuilder
+ */
 export declare class InteractionBuilder<R, E> {
     readonly definitions: D.InteractionDefinition<R, E>[];
     constructor(definitions: D.InteractionDefinition<R, E>[]);
     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>;
-    get syncGlobal(): import("../global.js").Effect<import("../index.js").DiscordREST, import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError, import("../DiscordREST/types.js").ResponseWithData<import("../types.js").ApplicationCommand[]>>;
-    syncGuild(appId: Discord.Snowflake, guildId: Discord.Snowflake): import("../global.js").Effect<import("../index.js").DiscordREST, import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError, import("../DiscordREST/types.js").ResponseWithData<import("../types.js").ApplicationCommand[]>>;
+    get syncGlobal(): import("../utils/common.js").Effect<import("../index.js").DiscordREST, import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError, import("../DiscordREST/types.js").ResponseWithData<import("../types.js").ApplicationCommand[]>>;
+    syncGuild(appId: Discord.Snowflake, guildId: Discord.Snowflake): import("../utils/common.js").Effect<import("../index.js").DiscordREST, import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError, import("../DiscordREST/types.js").ResponseWithData<import("../types.js").ApplicationCommand[]>>;
 }
 export declare const builder: InteractionBuilder<never, never>;
-export declare const id: (query: string) => (customId: string) => import("../global.js").Effect<never, never, boolean>;
-export declare const idStartsWith: (query: string) => (customId: string) => import("../global.js").Effect<never, never, boolean>;
-export declare const idRegex: (query: RegExp) => (customId: string) => import("../global.js").Effect<never, never, boolean>;
-export declare const option: (command: string, optionName: string) => (data: Pick<Discord.ApplicationCommandDatum, "name">, focusedOption: Pick<Discord.ApplicationCommandInteractionDataOption, "name">) => import("../global.js").Effect<never, never, boolean>;
-export declare const optionOnly: (optionName: string) => (_: unknown, focusedOption: Pick<Discord.ApplicationCommandInteractionDataOption, "name">) => import("../global.js").Effect<never, never, boolean>;
+export declare const id: (query: string) => (customId: string) => import("../utils/common.js").Effect<never, never, boolean>;
+export declare const idStartsWith: (query: string) => (customId: string) => import("../utils/common.js").Effect<never, never, boolean>;
+export declare const idRegex: (query: RegExp) => (customId: string) => import("../utils/common.js").Effect<never, never, boolean>;
+export declare const option: (command: string, optionName: string) => (data: Pick<Discord.ApplicationCommandDatum, "name">, focusedOption: Pick<Discord.ApplicationCommandInteractionDataOption, "name">) => import("../utils/common.js").Effect<never, never, boolean>;
+export declare const optionOnly: (optionName: string) => (_: unknown, focusedOption: Pick<Discord.ApplicationCommandInteractionDataOption, "name">) => import("../utils/common.js").Effect<never, never, boolean>;

package/Interactions/index.js

@@ -3,6 +3,9 @@ import * as tsplus_module_2 from "dfx";
 export * from "./context.js";
 export { global, guild, messageComponent, modalSubmit, autocomplete, } from "./definitions.js";
 export { response as r } from "../Helpers/interactions.js";
+/**
+ * @tsplus type dfx/InteractionBuilder
+ */
 export class InteractionBuilder {
     definitions;
     constructor(definitions) {

package/Interactions/index.js.map

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

package/Interactions/webhook.d.ts

@@ -1,6 +1,5 @@
 import { Discord } from "dfx";
-import { Effect } from "@effect/io/Effect";
-import { Cause } from "@effect/io/Cause";
+import { Effect, Cause } from "dfx/utils/common";
 import { DefinitionNotFound } from "./handlers.js";
 import { InteractionBuilder } from "./index.js";
 export declare class BadWebhookSignature {
@@ -17,8 +16,8 @@ declare const makeConfig: ({ applicationId, publicKey }: MakeConfigOpts) => {
 };
 export interface WebhookConfig extends ReturnType<typeof makeConfig> {
 }
-export declare const WebhookConfig: import("../global.js").Tag<WebhookConfig>;
-export declare const makeConfigLayer: (a_0: MakeConfigOpts) => import("../global.js").Layer<never, never, WebhookConfig>;
+export declare const WebhookConfig: import("../utils/common.js").Tag<WebhookConfig>;
+export declare const makeConfigLayer: (a_0: MakeConfigOpts) => import("../utils/common.js").Layer<never, never, WebhookConfig>;
 export declare class WebhookParseError {
     readonly reason: unknown;
     readonly _tag = "WebhookParseError";
@@ -30,9 +29,17 @@ export interface HandleWebhookOpts<E> {
     success: (a: Discord.InteractionResponse) => Effect<never, never, void>;
     error: (e: Cause<E>) => Effect<never, never, void>;
 }
-export declare const makeHandler: <R, E>(ix: InteractionBuilder<R, E>) => ({ headers, body, success, error, }: HandleWebhookOpts<DefinitionNotFound | BadWebhookSignature | WebhookParseError | E>) => import("../global.js").Effect<WebhookConfig | Exclude<R, import("../types.js").Interaction>, never, void>;
+/**
+ * @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("../utils/common.js").Effect<WebhookConfig | Exclude<R, import("../types.js").Interaction>, never, void>;
+/**
+ * @tsplus getter dfx/InteractionBuilder simpleWebhookHandler
+ * @tsplus location "dfx/Interactions/webhook"
+ */
 export declare const makeSimpleHandler: <R, E>(ix: InteractionBuilder<R, E>) => ({ headers, body }: {
     headers: Headers;
     body: string;
-}) => import("../global.js").Effect<WebhookConfig | Exclude<R, import("../types.js").Interaction>, DefinitionNotFound | BadWebhookSignature | WebhookParseError | E, import("../types.js").InteractionResponse>;
+}) => import("../utils/common.js").Effect<WebhookConfig | Exclude<R, import("../types.js").Interaction>, DefinitionNotFound | BadWebhookSignature | WebhookParseError | E, import("../types.js").InteractionResponse>;
 export {};

package/Interactions/webhook.js

@@ -1,9 +1,8 @@
 import * as tsplus_module_1 from "@fp-ts/data/Option";
 import * as tsplus_module_2 from "@fp-ts/data/Either";
-import * as tsplus_module_3 from "@fp-ts/data/Context";
+import * as tsplus_module_3 from "dfx/utils/common";
 import * as tsplus_module_4 from "@effect/io/Layer";
-import * as tsplus_module_5 from "@fp-ts/data/Function";
-import * as tsplus_module_6 from "@effect/io/Effect";
+import * as tsplus_module_5 from "@effect/io/Effect";
 import Nacl from "tweetnacl";
 import { handlers } from "./handlers.js";
 import { InteractionContext } from "./index.js";
@@ -23,7 +22,7 @@ const makeConfig = ({ applicationId, publicKey }) => ({
     publicKey: fromHex(publicKey),
 });
 export const WebhookConfig = tsplus_module_3.Tag();
-export const makeConfigLayer = tsplus_module_5.flow(makeConfig, tsplus_module_4.succeed(WebhookConfig));
+export const makeConfigLayer = tsplus_module_3.flow(makeConfig, tsplus_module_4.succeed(WebhookConfig));
 export class WebhookParseError {
     reason;
     _tag = "WebhookParseError";
@@ -31,18 +30,24 @@ export class WebhookParseError {
         this.reason = reason;
     }
 }
-const fromHeadersAndBody = (headers, body) => tsplus_module_6.flatMap(({ publicKey }) => tsplus_module_6.flatMap(() => tsplus_module_6.tryCatch(() => JSON.parse(body), (reason) => new WebhookParseError(reason)))(tsplus_module_6.fromEither(checkSignature(publicKey, headers, body))))(tsplus_module_6.service(WebhookConfig));
+const fromHeadersAndBody = (headers, body) => tsplus_module_5.flatMap(({ publicKey }) => tsplus_module_5.flatMap(() => tsplus_module_5.tryCatch(() => JSON.parse(body), (reason) => new WebhookParseError(reason)))(tsplus_module_5.fromEither(checkSignature(publicKey, headers, body))))(tsplus_module_5.service(WebhookConfig));
 const run = (definitions) => {
     const handler = handlers(definitions);
-    return (headers, body) => tsplus_module_6.flatMap(interaction => {
-        const provide = tsplus_module_6.provideService(InteractionContext)(interaction);
+    return (headers, body) => tsplus_module_5.flatMap(interaction => {
+        const provide = tsplus_module_5.provideService(InteractionContext)(interaction);
         return provide(handler[interaction.type](interaction));
     })(fromHeadersAndBody(headers, body));
 };
+/**
+ * @tsplus getter dfx/InteractionBuilder webhookHandler
+ */
 export const makeHandler = (ix) => {
     const handle = run(ix.definitions);
-    return ({ headers, body, success, error, }) => tsplus_module_6.catchAllCause(error)(tsplus_module_6.flatMap(success)(handle(headers, body)));
+    return ({ headers, body, success, error, }) => tsplus_module_5.catchAllCause(error)(tsplus_module_5.flatMap(success)(handle(headers, body)));
 };
+/**
+ * @tsplus getter dfx/InteractionBuilder simpleWebhookHandler
+ */
 export const makeSimpleHandler = (ix) => {
     const handle = run(ix.definitions);
     return ({ headers, body }) => handle(headers, body);

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/Log/index.d.ts

@@ -1,12 +1,12 @@
 declare const make: (debug?: boolean) => {
-    info: (...args: any[]) => import("../global.js").Effect<never, never, void>;
-    debug: (...args: any[]) => import("../global.js").Effect<never, never, void>;
+    info: (...args: any[]) => import("../utils/common.js").Effect<never, never, void>;
+    debug: (...args: any[]) => import("../utils/common.js").Effect<never, never, void>;
 };
 export interface Log extends ReturnType<typeof make> {
 }
-export declare const Log: import("../global.js").Tag<Log>;
-export declare const LiveLog: import("../global.js").Layer<never, never, Log>;
-export declare const LiveLogDebug: import("../global.js").Layer<never, never, Log>;
-export declare const info: (...args: any[]) => import("../global.js").Effect<Log, never, void>;
-export declare const debug: (...args: any[]) => import("../global.js").Effect<Log, never, void>;
+export declare const Log: import("../utils/common.js").Tag<Log>;
+export declare const LiveLog: import("../utils/common.js").Layer<never, never, Log>;
+export declare const LiveLogDebug: import("../utils/common.js").Layer<never, never, Log>;
+export declare const info: (...args: any[]) => import("../utils/common.js").Effect<Log, never, void>;
+export declare const debug: (...args: any[]) => import("../utils/common.js").Effect<Log, never, void>;
 export {};

package/Log/index.js

@@ -1,5 +1,5 @@
 import * as tsplus_module_1 from "@effect/io/Effect";
-import * as tsplus_module_2 from "@fp-ts/data/Context";
+import * as tsplus_module_2 from "dfx/utils/common";
 import * as tsplus_module_3 from "@effect/io/Layer";
 const make = (debug = false) => ({
     info: (...args) => tsplus_module_1.sync(() => {

package/RateLimit/index.d.ts

@@ -1,6 +1,4 @@
-import { Effect } from "@effect/io/Effect";
-import { Maybe } from "dfx";
-import { Duration } from "@fp-ts/data/Duration";
+import { Effect, Maybe, Duration } from "dfx/utils/common";
 import { Success } from "dfx/utils/effect";
 export type BucketDetails = {
     key: "global" | string;
@@ -14,13 +12,13 @@ export interface RateLimitStore {
     putBucketRoute: (route: string, bucketKey: string) => Effect<never, never, void>;
     incrementCounter: (key: string, window: number, limit: number) => Effect<never, never, readonly [count: number, ttl: number]>;
 }
-export declare const RateLimitStore: import("../global.js").Tag<RateLimitStore>;
-export declare const LiveMemoryRateLimitStore: import("../global.js").Layer<never, never, RateLimitStore>;
-declare const makeLimiter: import("../global.js").Effect<import("../Log/index.js").Log | RateLimitStore, never, {
-    maybeWait: (key: string, window: Duration, limit: number, multiplier?: number) => import("../global.js").Effect<never, never, void>;
+export declare const RateLimitStore: import("../utils/common.js").Tag<RateLimitStore>;
+export declare const LiveMemoryRateLimitStore: import("../utils/common.js").Layer<never, never, RateLimitStore>;
+declare const makeLimiter: import("../utils/common.js").Effect<import("../Log/index.js").Log | RateLimitStore, never, {
+    maybeWait: (key: string, window: Duration, limit: number, multiplier?: number) => import("../utils/common.js").Effect<never, never, void>;
 }>;
 export interface RateLimiter extends Success<typeof makeLimiter> {
 }
-export declare const RateLimiter: import("../global.js").Tag<RateLimiter>;
-export declare const LiveRateLimiter: import("../global.js").Layer<import("../Log/index.js").Log | RateLimitStore, never, RateLimiter>;
+export declare const RateLimiter: import("../utils/common.js").Tag<RateLimiter>;
+export declare const LiveRateLimiter: import("../utils/common.js").Layer<import("../Log/index.js").Log | RateLimitStore, never, RateLimiter>;
 export {};

package/RateLimit/index.js

@@ -1,4 +1,4 @@
-import * as tsplus_module_1 from "@fp-ts/data/Context";
+import * as tsplus_module_1 from "dfx/utils/common";
 import * as tsplus_module_2 from "@effect/io/Layer";
 import * as tsplus_module_3 from "@effect/io/Effect";
 import * as tsplus_module_4 from "dfx";

package/RateLimit/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/RateLimit/index.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AA6BrC,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAA,GAAG,EAAkB,CAAA;AACnD,MAAM,CAAC,MAAM,wBAAwB,GAAG,qBAAW,cAAc,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;AAE/E,MAAM,WAAW,2BACT,KAAK,wBACL,GAAG;IAET,MAAM,SAAS,GAAG,CAChB,GAAW,EACX,MAAgB,EAChB,KAAa,EACb,UAAU,GAAG,IAAI,EACjB,EAAE;QACF,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,GAAG,UAAU,CAAA;QAC3C,8BAAO,2CAAA,oBAGA,CAAC,CAAC,EAAE,EAAE,CACT,GAAG,CAAC,KAAK,CAAC,0BAA0B,EAAE;YACpC,GAAG;YACH,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,QAAQ;YACR,KAAK;YACL,KAAK,EAAE,CAAC,CAAC,MAAM;SAChB,CAAC,EAVC,oBAEA,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,EAFxD,KAAK;aACT,gBAAgB,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,CACuB,CAS7D,CACiB,EAAO;IAC7B,CAAC,CAAA;IAED,OAAO,EAAE,SAAS,EAAE,CAAA;GAxBN,wBAAe,gBAAA,GAAG,CAAC,GAAG,CAAC,GADrB,wBAAe,cAAc,CAAC,CA0B9C,CAAA;AAGF,MAAM,CAAC,MAAM,WAAW,GAAG,gBAAA,GAAG,EAAe,CAAA;AAC7C,MAAM,CAAC,MAAM,eAAe,GAAG,2BAAiB,WAAW,CAAC,CAAC,WAAW,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/RateLimit/index.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AA6BrC,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAA,GAAG,EAAkB,CAAA;AACnD,MAAM,CAAC,MAAM,wBAAwB,GAAG,qBAAW,cAAc,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;AAE/E,MAAM,WAAW,2BACT,KAAK,wBACL,GAAG;IAET,MAAM,SAAS,GAAG,CAChB,GAAW,EACX,MAAgB,EAChB,KAAa,EACb,UAAU,GAAG,IAAI,EACjB,EAAE;QACF,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,GAAG,UAAU,CAAA;QAE3C,8BAAO,2CAAA,oBAGA,CAAC,CAAC,EAAE,EAAE,CACT,GAAG,CAAC,KAAK,CAAC,0BAA0B,EAAE;YACpC,GAAG;YACH,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,QAAQ;YACR,KAAK;YACL,KAAK,EAAE,CAAC,CAAC,MAAM;SAChB,CAAC,EAVC,oBAEA,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,EAFxD,KAAK;aACT,gBAAgB,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,CACuB,CAS7D,CACiB,EAAO;IAC7B,CAAC,CAAA;IAED,OAAO,EAAE,SAAS,EAAE,CAAA;GAzBN,wBAAe,gBAAA,GAAG,CAAC,GAAG,CAAC,GADrB,wBAAe,cAAc,CAAC,CA2B9C,CAAA;AAGF,MAAM,CAAC,MAAM,WAAW,GAAG,gBAAA,GAAG,EAAe,CAAA;AAC7C,MAAM,CAAC,MAAM,eAAe,GAAG,2BAAiB,WAAW,CAAC,CAAC,WAAW,CAAC,CAAA"}

package/RateLimit/utils.d.ts

@@ -1,2 +1,2 @@
-import { Duration } from "@fp-ts/data/Duration";
+import { Duration } from "dfx/utils/common";
 export declare const delayFrom: (window: number, limit: number, count: number, ttl: number) => Duration;

package/gateway.d.ts

@@ -6,9 +6,9 @@ export * as ShardStore from "./DiscordGateway/ShardStore/index.js";
 export * as Gateway from "./DiscordGateway/index.js";
 export * as CachePrelude from "./Cache/prelude.js";
 export { run as runIx } from "./Interactions/gateway.js";
-export declare const MemoryRateLimit: import("./global.js").Layer<import("./Log/index.js").Log, never, import("./index.js").RateLimitStore | import("./index.js").RateLimiter>;
-export declare const MemoryREST: import("./global.js").Layer<import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig, never, import("./index.js").DiscordREST>;
-export declare const MemorySharder: import("./global.js").Layer<import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig, never, import("./DiscordGateway/Sharder/index.js").Sharder>;
-export declare const MemoryGateway: import("./global.js").Layer<import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig, never, import("./DiscordGateway/index.js").DiscordGateway>;
-export declare const MemoryBot: import("./global.js").Layer<import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig, never, import("./index.js").DiscordREST | import("./index.js").RateLimitStore | import("./index.js").RateLimiter | import("./DiscordGateway/index.js").DiscordGateway>;
-export declare const make: (config: Config.MakeOpts, debug?: boolean) => import("./global.js").Layer<never, never, import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig | import("./index.js").DiscordREST | import("./index.js").RateLimitStore | import("./index.js").RateLimiter | import("./DiscordGateway/index.js").DiscordGateway>;
+export declare const MemoryRateLimit: import("./utils/common.js").Layer<import("./Log/index.js").Log, never, import("./index.js").RateLimitStore | import("./index.js").RateLimiter>;
+export declare const MemoryREST: import("./utils/common.js").Layer<import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig, never, import("./index.js").DiscordREST>;
+export declare const MemorySharder: import("./utils/common.js").Layer<import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig, never, import("./DiscordGateway/Sharder/index.js").Sharder>;
+export declare const MemoryGateway: import("./utils/common.js").Layer<import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig, never, import("./DiscordGateway/index.js").DiscordGateway>;
+export declare const MemoryBot: import("./utils/common.js").Layer<import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig, never, import("./index.js").DiscordREST | import("./index.js").RateLimitStore | import("./index.js").RateLimiter | import("./DiscordGateway/index.js").DiscordGateway>;
+export declare const make: (config: Config.MakeOpts, debug?: boolean) => import("./utils/common.js").Layer<never, never, import("./index.js").DiscordREST | import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig | import("./index.js").RateLimitStore | import("./index.js").RateLimiter | import("./DiscordGateway/index.js").DiscordGateway>;

package/global.d.ts

@@ -1,71 +1,7 @@
 /**
  * @tsplus global
  */
-import type { Effect } from "@effect/io/Effect";
-/**
- * @tsplus global
- */
-import type { Layer } from "@effect/io/Layer";
-/**
- * @tsplus global
- */
-import type { Dequeue, Queue } from "@effect/io/Queue";
-/**
- * @tsplus global
- */
-import type { Schedule } from "@effect/io/Schedule";
-/**
- * @tsplus global
- */
-import type { Cause } from "@effect/io/Cause";
-/**
- * @tsplus global
- */
-import type { Chunk } from "@fp-ts/data/Chunk";
-/**
- * @tsplus global
- */
-import { Context, Tag } from "@fp-ts/data/Context";
-/**
- * @tsplus global
- */
-import type { Duration } from "@fp-ts/data/Duration";
-/**
- * @tsplus global
- */
-import type { Equal } from "@fp-ts/data/Equal";
-/**
- * @tsplus global
- */
-import type { Maybe } from "dfx";
-/**
- * @tsplus global
- */
-import type { Either } from "@fp-ts/data/Either";
-/**
- * @tsplus global
- */
-import type { Exit } from "@effect/io/Exit";
-/**
- * @tsplus global
- */
-import type { EffectSource } from "callbag-effect-ts/Source";
-/**
- * @tsplus global
- */
-import type { EffectSink } from "callbag-effect-ts/Sink";
-/**
- * @tsplus global
- */
-import type { HashMap } from "@fp-ts/data/HashMap";
-/**
- * @tsplus global
- */
-import type { Ref } from "@effect/io/Ref";
-/**
- * @tsplus global
- */
-import type { HashSet } from "@fp-ts/data/HashSet";
+import { Cause, Duration, Effect, EffectSource, HashMap, HashSet, Layer, Maybe, Queue, Ref, Schedule, Tag, flow, identity, pipe, } from "dfx/utils/common";
 /**
  * @tsplus global
  */
@@ -82,14 +18,4 @@ import {} from "dfx/webhooks";
  * @tsplus global
  */
 import type { Success } from "dfx/utils/effect";
-/**
- * @tsplus global
- */
-import { pipe, flow, identity } from "@fp-ts/data/Function";
-export type { Effect } from "@effect/io/Effect";
-export type { Layer } from "@effect/io/Layer";
-export type {} from "@effect/io/Queue";
-export { Context, Tag } from "@fp-ts/data/Context";
-export type { Duration } from "@fp-ts/data/Duration";
-export type { HashMap } from "@fp-ts/data/HashMap";
-export type { Ref } from "@effect/io/Ref";
+export {};

package/global.js

@@ -1,2 +1,2 @@
-export { Tag } from "@fp-ts/data/Context";
+export {};
 //# sourceMappingURL=global.js.map

package/global.js.map

@@ -1 +1 @@
-{"version":3,"file":"global.js","sourceRoot":"","sources":["../src/global.ts"],"names":[],"mappings":"AAqCA,OAAO,EAAW,GAAG,EAAE,MAAM,qBAAqB,CAAA"}
+{"version":3,"file":"global.js","sourceRoot":"","sources":["../src/global.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dfx",
-  "version": "0.20.0",
+  "version": "0.20.2",
   "type": "module",
   "publishConfig": {
     "access": "public",
@@ -49,5 +49,5 @@
       "@fp-ts/data": "^0.0.25"
     }
   },
-  "gitHead": "379dfb9bdfef4d6ab9163da42b7f159d4085ff39"
+  "gitHead": "b3974878407648fd54d36710965964b26513cc2c"
 }

package/utils/common.d.ts

@@ -0,0 +1,18 @@
+export type { Cause } from "@effect/io/Cause";
+export type { Effect } from "@effect/io/Effect";
+export type { Exit } from "@effect/io/Exit";
+export type { Layer } from "@effect/io/Layer";
+export type { Dequeue, Queue } from "@effect/io/Queue";
+export type { Schedule } from "@effect/io/Schedule";
+export type { Chunk } from "@fp-ts/data/Chunk";
+export { Context, Tag } from "@fp-ts/data/Context";
+export type { Duration } from "@fp-ts/data/Duration";
+export type { Equal } from "@fp-ts/data/Equal";
+export type { Either } from "@fp-ts/data/Either";
+export type { HashMap } from "@fp-ts/data/HashMap";
+export type { Option as Maybe } from "@fp-ts/data/Option";
+export type { Ref } from "@effect/io/Ref";
+export type { HashSet } from "@fp-ts/data/HashSet";
+export { pipe, flow, identity } from "@fp-ts/data/Function";
+export type { EffectSource } from "callbag-effect-ts/Source";
+export type { EffectSink } from "callbag-effect-ts/Sink";

package/utils/common.js

@@ -0,0 +1,3 @@
+export { Tag } from "@fp-ts/data/Context";
+export { pipe, flow, identity } from "@fp-ts/data/Function";
+//# sourceMappingURL=common.js.map

package/utils/common.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/utils/common.ts"],"names":[],"mappings":"AAQA,OAAO,EAAW,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAQlD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA"}

package/utils/effect.d.ts

@@ -1,5 +1,4 @@
-import { Effect } from "@effect/io/Effect";
-import { Tag } from "@fp-ts/data/Context";
+import { Effect, Tag } from "dfx/utils/common";
 export type Success<A extends Effect<any, any, any>> = A extends Effect<any, any, infer R> ? R : never;
 export type ShapeFn<T> = Pick<T, {
     [k in keyof T]: T[k] extends (...args: infer ARGS) => Effect<infer R, infer E, infer A> ? ((...args: ARGS) => Effect<R, E, A>) extends T[k] ? k : never : never;

package/webhooks.d.ts

@@ -1,6 +1,6 @@
 import { Config } from "dfx";
 import { MakeConfigOpts } from "./Interactions/webhook.js";
 export { makeConfigLayer, makeHandler, makeSimpleHandler, WebhookConfig, WebhookParseError, BadWebhookSignature, } from "./Interactions/webhook.js";
-export declare const MemoryRateLimit: import("./global.js").Layer<import("./Log/index.js").Log, never, import("./index.js").RateLimitStore | import("./index.js").RateLimiter>;
-export declare const MemoryREST: import("./global.js").Layer<import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig, never, import("./index.js").DiscordREST>;
-export declare const make: (config: Config.MakeOpts & MakeConfigOpts, debug?: boolean) => import("./global.js").Layer<never, never, import("./index.js").DiscordREST | import("./index.js").RateLimitStore | import("./index.js").RateLimiter | import("./Interactions/webhook.js").WebhookConfig>;
+export declare const MemoryRateLimit: import("./utils/common.js").Layer<import("./Log/index.js").Log, never, import("./index.js").RateLimitStore | import("./index.js").RateLimiter>;
+export declare const MemoryREST: import("./utils/common.js").Layer<import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig, never, import("./index.js").DiscordREST>;
+export declare const make: (config: Config.MakeOpts & MakeConfigOpts, debug?: boolean) => import("./utils/common.js").Layer<never, never, import("./index.js").DiscordREST | import("./index.js").RateLimitStore | import("./index.js").RateLimiter | import("./Interactions/webhook.js").WebhookConfig>;