dfx 0.20.5 → 0.21.0

package/DiscordREST/utils.js

@@ -1,5 +1,5 @@
 import * as tsplus_module_1 from "@fp-ts/data/Option";
-import * as tsplus_module_2 from "@fp-ts/data/Duration";
+import { Duration, Option } from "dfx/_common";
 const majorResources = ["channels", "guilds", "webhooks"];
 export const routeFromConfig = (path, init) => {
     const method = (init?.method ?? "get").toLowerCase();
@@ -11,10 +11,10 @@ export const routeFromConfig = (path, init) => {
         .replace(/\/reactions\/(.*)/, "/reactions");
     return `${method}-${routeURL}`;
 };
-export const numberHeader = (headers) => (key) => tsplus_module_1.filter((n) => !isNaN(n))(tsplus_module_1.map(parseFloat)(tsplus_module_1.fromNullable(headers.get(key))));
-export const retryAfter = (headers) => tsplus_module_1.map(tsplus_module_2.seconds)(tsplus_module_1.catchAll(() => numberHeader(headers)("retry-after"))(numberHeader(headers)("x-ratelimit-reset-after")));
-export const rateLimitFromHeaders = (headers) => tsplus_module_1.struct({
-    bucket: tsplus_module_1.fromNullable(headers.get("x-ratelimit-bucket")),
+export const numberHeader = (headers) => (key) => tsplus_module_1.filter((n) => !isNaN(n))(tsplus_module_1.map(parseFloat)(Option.fromNullable(headers.get(key))));
+export const retryAfter = (headers) => tsplus_module_1.map(Duration.seconds)(tsplus_module_1.catchAll(() => numberHeader(headers)("retry-after"))(numberHeader(headers)("x-ratelimit-reset-after")));
+export const rateLimitFromHeaders = (headers) => Option.struct({
+    bucket: Option.fromNullable(headers.get("x-ratelimit-bucket")),
     retryAfter: retryAfter(headers),
     limit: numberHeader(headers)("x-ratelimit-limit"),
     remaining: numberHeader(headers)("x-ratelimit-remaining"),

package/DiscordREST/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/DiscordREST/utils.ts"],"names":[],"mappings":";;AAAA,MAAM,cAAc,GAAG,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAU,CAAA;AAElE,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,IAAiB,EAAE,EAAE;IACjE,MAAM,MAAM,GAAG,CAAC,IAAI,EAAE,MAAM,IAAI,KAAK,CAAC,CAAC,WAAW,EAAE,CAAA;IAEpD,uBAAuB;IACvB,MAAM,QAAQ,GAAG,IAAI;SAClB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SACb,OAAO,CAAC,iCAAiC,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAC9D,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,QAAQ,EAAE,CAC3D;QACD,kBAAkB;SACjB,OAAO,CAAC,mBAAmB,EAAE,YAAY,CAAC,CAAA;IAE7C,OAAO,GAAG,MAAM,IAAI,QAAQ,EAAE,CAAA;AAChC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,CAAC,GAAW,EAAE,EAAE,CAChE,uBAEU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAF1B,oBACO,UAAU,EADjB,6BAAmB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAClB,CACS,CAAA;AAE7B,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,OAAgB,EAAE,EAAE,CAC7C,6CAAA,yBACY,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,EADtD,YAAY,CAAC,OAAO,CAAC,CAAC,yBAAyB,CAAC,CACO,CAC/B,CAAA;AAE1B,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,OAAgB,EAAE,EAAE,CACvD,uBAAa;IACX,MAAM,EAAE,6BAAmB,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IAC7D,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC;IAC/B,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,mBAAmB,CAAC;IACjD,SAAS,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,uBAAuB,CAAC;CAC1D,CAAC,CAAA"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/DiscordREST/utils.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAE9C,MAAM,cAAc,GAAG,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAU,CAAA;AAElE,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,IAAiB,EAAE,EAAE;IACjE,MAAM,MAAM,GAAG,CAAC,IAAI,EAAE,MAAM,IAAI,KAAK,CAAC,CAAC,WAAW,EAAE,CAAA;IAEpD,uBAAuB;IACvB,MAAM,QAAQ,GAAG,IAAI;SAClB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SACb,OAAO,CAAC,iCAAiC,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAC9D,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,QAAQ,EAAE,CAC3D;QACD,kBAAkB;SACjB,OAAO,CAAC,mBAAmB,EAAE,YAAY,CAAC,CAAA;IAE7C,OAAO,GAAG,MAAM,IAAI,QAAQ,EAAE,CAAA;AAChC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,CAAC,GAAW,EAAE,EAAE,CAChE,uBAEU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAF1B,oBACO,UAAU,EADjB,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CACnB,CACS,CAAA;AAE7B,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,OAAgB,EAAE,EAAE,CAC7C,oBAEO,QAAQ,CAAC,OAAO,EAFvB,yBACY,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,EADtD,YAAY,CAAC,OAAO,CAAC,CAAC,yBAAyB,CAAC,CACO,CAC/B,CAAA;AAE1B,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,OAAgB,EAAE,EAAE,CACvD,MAAM,CAAC,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IAC9D,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC;IAC/B,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,mBAAmB,CAAC;IACjD,SAAS,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,uBAAuB,CAAC;CAC1D,CAAC,CAAA"}

package/Helpers/intents.js

@@ -1,14 +1,14 @@
-import * as tsplus_module_1 from "dfx";
+import { Discord, Flags } from "dfx";
 /**
  * All the intents
  */
-export const ALL = tsplus_module_1.Flags.all(tsplus_module_1.Discord.GatewayIntents);
+export const ALL = Flags.all(Discord.GatewayIntents);
 /**
  * Privileged intents
  */
-export const PRIVILEGED = tsplus_module_1.Discord.GatewayIntents.GUILD_PRESENCES |
-    tsplus_module_1.Discord.GatewayIntents.GUILD_MEMBERS |
-    tsplus_module_1.Discord.GatewayIntents.MESSAGE_CONTENT;
+export const PRIVILEGED = Discord.GatewayIntents.GUILD_PRESENCES |
+    Discord.GatewayIntents.GUILD_MEMBERS |
+    Discord.GatewayIntents.MESSAGE_CONTENT;
 /**
  * Un-privileged intents
  */
@@ -16,13 +16,13 @@ export const UNPRIVILEGED = ALL ^ PRIVILEGED;
 /**
  * Function that converts a intents bitfield value to a list of intent names.
  */
-export const toList = tsplus_module_1.Flags.toList(tsplus_module_1.Discord.GatewayIntents);
+export const toList = Flags.toList(Discord.GatewayIntents);
 /**
  * Function that converts a list of intent names to a bitfield value.
  */
-export const fromList = tsplus_module_1.Flags.fromList(tsplus_module_1.Discord.GatewayIntents);
+export const fromList = Flags.fromList(Discord.GatewayIntents);
 /**
  * Check if an intent flag exists in the permissions.
  */
-export const has = tsplus_module_1.Flags.has;
+export const has = Flags.has;
 //# sourceMappingURL=intents.js.map

package/Helpers/intents.js.map

@@ -1 +1 @@
-{"version":3,"file":"intents.js","sourceRoot":"","sources":["../../src/Helpers/intents.ts"],"names":[],"mappings":";AAAA;;GAEG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,gBAAA,KAAK,CAAC,GAAG,CAAC,gBAAA,OAAO,CAAC,cAAc,CAAC,CAAA;AAEpD;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GACrB,gBAAA,OAAO,CAAC,cAAc,CAAC,eAAe;IACtC,gBAAA,OAAO,CAAC,cAAc,CAAC,aAAa;IACpC,gBAAA,OAAO,CAAC,cAAc,CAAC,eAAe,CAAA;AAExC;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,GAAG,UAAU,CAAA;AAE5C;;GAEG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,gBAAA,KAAK,CAAC,MAAM,CAAC,gBAAA,OAAO,CAAC,cAAc,CAAC,CAAA;AAE1D;;GAEG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,gBAAA,KAAK,CAAC,QAAQ,CAAC,gBAAA,OAAO,CAAC,cAAc,CAAC,CAAA;AAE9D;;GAEG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,gBAAA,KAAK,CAAC,GAAG,CAAA"}
+{"version":3,"file":"intents.js","sourceRoot":"","sources":["../../src/Helpers/intents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,KAAK,CAAA;AAEpC;;GAEG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;AAEpD;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GACrB,OAAO,CAAC,cAAc,CAAC,eAAe;IACtC,OAAO,CAAC,cAAc,CAAC,aAAa;IACpC,OAAO,CAAC,cAAc,CAAC,eAAe,CAAA;AAExC;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,GAAG,UAAU,CAAA;AAE5C;;GAEG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;AAE1D;;GAEG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;AAE9D;;GAEG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAA"}

package/Helpers/interactions.d.ts

@@ -1,21 +1,20 @@
-import { Discord } from "dfx";
-import { Maybe } from "dfx/utils/common";
+import { Discord, HashMap, Option } from "dfx/_common";
 /**
  * Maybe find a sub-command within the interaction options.
  */
-export declare const allSubCommands: (interaction: Discord.ApplicationCommandDatum) => readonly import("../types.js").ApplicationCommandInteractionDataOption[];
+export declare const allSubCommands: (interaction: Discord.ApplicationCommandDatum) => readonly Discord.ApplicationCommandInteractionDataOption[];
 /**
  * Maybe find a sub-command within the interaction options.
  */
-export declare const findSubCommand: (name: string) => (interaction: Discord.ApplicationCommandDatum) => import("../index.js").Maybe<import("../types.js").ApplicationCommandInteractionDataOption>;
+export declare const findSubCommand: (name: string) => (interaction: Discord.ApplicationCommandDatum) => Option.Option<Discord.ApplicationCommandInteractionDataOption>;
 /**
  * If the sub-command exists return `true`, else `false`.
  */
-export declare const isSubCommand: (name: string) => (interaction: import("../types.js").ApplicationCommandDatum) => boolean;
+export declare const isSubCommand: (name: string) => (interaction: Discord.ApplicationCommandDatum) => boolean;
 /**
  * Maybe get the options for a sub-command
  */
-export declare const subCommandOptions: (name: string) => (interaction: import("../types.js").ApplicationCommandDatum) => import("../index.js").Maybe<import("../types.js").ApplicationCommandInteractionDataOption[]>;
+export declare const subCommandOptions: (name: string) => (interaction: Discord.ApplicationCommandDatum) => Option.Option<Discord.ApplicationCommandInteractionDataOption[]>;
 /**
  * A lens for accessing nested options in a interaction.
  */
@@ -23,35 +22,35 @@ export declare const optionsWithNested: (data: Pick<Discord.ApplicationCommandDa
 /**
  * Return the interaction options as a name / value map.
  */
-export declare const transformOptions: (options: Discord.ApplicationCommandInteractionDataOption[]) => import("../utils/common.js").HashMap<string, string | undefined>;
+export declare const transformOptions: (options: Discord.ApplicationCommandInteractionDataOption[]) => HashMap.HashMap<string, string | undefined>;
 /**
  * Return the interaction options as a name / value map.
  */
-export declare const optionsMap: (data: Pick<import("../types.js").ApplicationCommandDatum, "options">) => import("../utils/common.js").HashMap<string, string | undefined>;
+export declare const optionsMap: (data: Pick<Discord.ApplicationCommandDatum, "options">) => HashMap.HashMap<string, string | undefined>;
 /**
  * Try find a matching option from the interaction.
  */
-export declare const getOption: (name: string) => (data: Pick<import("../types.js").ApplicationCommandDatum, "options">) => import("../index.js").Maybe<import("../types.js").ApplicationCommandInteractionDataOption>;
+export declare const getOption: (name: string) => (data: Pick<Discord.ApplicationCommandDatum, "options">) => Option.Option<Discord.ApplicationCommandInteractionDataOption>;
 /**
  * Try find a matching option from the interaction.
  */
-export declare const focusedOption: (data: Pick<import("../types.js").ApplicationCommandDatum, "options">) => import("../index.js").Maybe<import("../types.js").ApplicationCommandInteractionDataOption>;
+export declare const focusedOption: (data: Pick<Discord.ApplicationCommandDatum, "options">) => Option.Option<Discord.ApplicationCommandInteractionDataOption>;
 /**
  * Try find a matching option value from the interaction.
  */
-export declare const optionValue: (name: string) => (data: Pick<import("../types.js").ApplicationCommandDatum, "options">) => import("../index.js").Maybe<string>;
+export declare const optionValue: (name: string) => (data: Pick<Discord.ApplicationCommandDatum, "options">) => Option.Option<string>;
 /**
  * Try extract resolved data
  */
-export declare const resolved: (data: Discord.Interaction) => import("../index.js").Maybe<import("../types.js").ResolvedDatum>;
+export declare const resolved: (data: Discord.Interaction) => Option.Option<Discord.ResolvedDatum>;
 /**
  * Try find a matching option value from the interaction.
  */
-export declare const resolveOptionValue: <T>(name: string, f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => T | undefined) => (a: Discord.Interaction) => import("../index.js").Maybe<T>;
+export declare const resolveOptionValue: <T>(name: string, f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => T | undefined) => (a: Discord.Interaction) => Option.Option<T>;
 /**
  * Try find matching option values from the interaction.
  */
-export declare const resolveValues: <T>(f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => T | undefined) => (a: Discord.Interaction) => import("../index.js").Maybe<readonly T[]>;
+export declare const resolveValues: <T>(f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => T | undefined) => (a: Discord.Interaction) => Option.Option<readonly T[]>;
 /**
  * A lens for accessing the components in a interaction.
  */
@@ -59,23 +58,23 @@ export declare const components: (a: Discord.ModalSubmitDatum) => Discord.Compon
 /**
  * A lens for accessing the components in a interaction.
  */
-export declare const componentsWithValue: (a: import("../types.js").ModalSubmitDatum) => readonly import("../types.js").Component[];
+export declare const componentsWithValue: (a: Discord.ModalSubmitDatum) => readonly Discord.Component[];
 /**
  * Return the interaction components as an id / value map.
  */
-export declare const transformComponents: (options: Discord.Component[]) => import("../utils/common.js").HashMap<string, string | undefined>;
+export declare const transformComponents: (options: Discord.Component[]) => HashMap.HashMap<string, string | undefined>;
 /**
  * Return the interaction components as an id / value map.
  */
-export declare const componentsMap: (a: import("../types.js").ModalSubmitDatum) => import("../utils/common.js").HashMap<string, string | undefined>;
+export declare const componentsMap: (a: Discord.ModalSubmitDatum) => HashMap.HashMap<string, string | undefined>;
 /**
  * Try find a matching component from the interaction.
  */
-export declare const getComponent: (id: string) => (a: import("../types.js").ModalSubmitDatum) => import("../index.js").Maybe<import("../types.js").Component>;
+export declare const getComponent: (id: string) => (a: Discord.ModalSubmitDatum) => Option.Option<Discord.Component>;
 /**
  * Try find a matching component value from the interaction.
  */
-export declare const componentValue: (id: string) => (a: import("../types.js").ModalSubmitDatum) => import("../index.js").Maybe<string>;
+export declare const componentValue: (id: string) => (a: Discord.ModalSubmitDatum) => Option.Option<string>;
 export type InteractionResponse = {
     type: Discord.InteractionCallbackType.CHANNEL_MESSAGE_WITH_SOURCE;
     data: Discord.InteractionCallbackMessage;

package/Helpers/interactions.js

@@ -1,64 +1,63 @@
-import * as tsplus_module_1 from "dfx";
-import * as tsplus_module_2 from "dfx/utils/common";
-import * as tsplus_module_3 from "@fp-ts/data/Option";
-import * as tsplus_module_4 from "@fp-ts/data/HashMap";
+import * as tsplus_module_1 from "@fp-ts/data/Option";
+import * as tsplus_module_2 from "@fp-ts/data/HashMap";
 import * as Arr from "@fp-ts/data/ReadonlyArray";
+import { Discord, flow, HashMap, identity, Option, pipe } from "dfx/_common";
 /**
  * Maybe find a sub-command within the interaction options.
  */
-export const allSubCommands = (interaction) => tsplus_module_2.pipe(optionsWithNested(interaction), Arr.filter((o) => o.type === tsplus_module_1.Discord.ApplicationCommandOptionType.SUB_COMMAND));
+export const allSubCommands = (interaction) => pipe(optionsWithNested(interaction), Arr.filter((o) => o.type === Discord.ApplicationCommandOptionType.SUB_COMMAND));
 /**
  * Maybe find a sub-command within the interaction options.
  */
-export const findSubCommand = (name) => (interaction) => tsplus_module_2.pipe(optionsWithNested(interaction), Arr.findFirst((o) => o.type === tsplus_module_1.Discord.ApplicationCommandOptionType.SUB_COMMAND &&
+export const findSubCommand = (name) => (interaction) => pipe(optionsWithNested(interaction), Arr.findFirst((o) => o.type === Discord.ApplicationCommandOptionType.SUB_COMMAND &&
     o.name === name));
 /**
  * If the sub-command exists return `true`, else `false`.
  */
-export const isSubCommand = (name) => tsplus_module_2.flow(findSubCommand(name), (o) => tsplus_module_3.isSome(o));
+export const isSubCommand = (name) => flow(findSubCommand(name), (o) => tsplus_module_1.isSome(o));
 /**
  * Maybe get the options for a sub-command
  */
-export const subCommandOptions = (name) => tsplus_module_2.flow(findSubCommand(name), (o) => tsplus_module_3.flatMapNullable((o) => o.options)(o));
+export const subCommandOptions = (name) => flow(findSubCommand(name), (o) => tsplus_module_1.flatMapNullable((o) => o.options)(o));
 /**
  * A lens for accessing nested options in a interaction.
  */
 export const optionsWithNested = (data) => {
-    const optsFromOption = (opt) => tsplus_module_3.match(() => [], tsplus_module_2.identity)(tsplus_module_3.map((opts) => [...opts, ...opts.flatMap(optsFromOption)])(tsplus_module_3.fromNullable(opt.options)));
-    return tsplus_module_3.getOrElse(() => [])(tsplus_module_3.map((opts) => [...opts, ...opts.flatMap(optsFromOption)])(tsplus_module_3.fromNullable(data.options)));
+    const optsFromOption = (opt) => tsplus_module_1.match(() => [], identity)(tsplus_module_1.map((opts) => [...opts, ...opts.flatMap(optsFromOption)])(Option.fromNullable(opt.options)));
+    return tsplus_module_1.getOrElse(() => [])(tsplus_module_1.map((opts) => [...opts, ...opts.flatMap(optsFromOption)])(Option.fromNullable(data.options)));
 };
 /**
  * Return the interaction options as a name / value map.
  */
-export const transformOptions = (options) => options.reduce((map, option) => tsplus_module_4.set(option.name, option.value)(map), tsplus_module_4.empty());
+export const transformOptions = (options) => options.reduce((map, option) => tsplus_module_2.set(option.name, option.value)(map), HashMap.empty());
 /**
  * Return the interaction options as a name / value map.
  */
-export const optionsMap = tsplus_module_2.flow(optionsWithNested, transformOptions);
+export const optionsMap = flow(optionsWithNested, transformOptions);
 /**
  * Try find a matching option from the interaction.
  */
-export const getOption = (name) => tsplus_module_2.flow(optionsWithNested, Arr.findFirst((o) => o.name === name));
+export const getOption = (name) => flow(optionsWithNested, Arr.findFirst((o) => o.name === name));
 /**
  * Try find a matching option from the interaction.
  */
-export const focusedOption = tsplus_module_2.flow(optionsWithNested, Arr.findFirst((o) => o.focused === true));
+export const focusedOption = flow(optionsWithNested, Arr.findFirst((o) => o.focused === true));
 /**
  * Try find a matching option value from the interaction.
  */
-export const optionValue = (name) => tsplus_module_2.flow(getOption(name), (o) => tsplus_module_3.flatMapNullable((o) => o.value)(o));
+export const optionValue = (name) => flow(getOption(name), (o) => tsplus_module_1.flatMapNullable((o) => o.value)(o));
 /**
  * Try extract resolved data
  */
-export const resolved = (data) => tsplus_module_3.flatMapNullable((a) => a.resolved)(tsplus_module_3.fromNullable(data.data));
+export const resolved = (data) => tsplus_module_1.flatMapNullable((a) => a.resolved)(Option.fromNullable(data.data));
 /**
  * Try find a matching option value from the interaction.
  */
-export const resolveOptionValue = (name, f) => (a) => tsplus_module_3.flatMap(data => tsplus_module_3.flatMap(id => tsplus_module_3.flatMap(r => tsplus_module_3.fromNullable(f(id, r)))(resolved(a)))(tsplus_module_3.flatMapNullable(({ value }) => value)(getOption(name)(data))))(tsplus_module_3.fromNullable(a.data));
+export const resolveOptionValue = (name, f) => (a) => tsplus_module_1.flatMap(data => tsplus_module_1.flatMap(id => tsplus_module_1.flatMap(r => Option.fromNullable(f(id, r)))(resolved(a)))(tsplus_module_1.flatMapNullable(({ value }) => value)(getOption(name)(data))))(Option.fromNullable(a.data));
 /**
  * Try find matching option values from the interaction.
  */
-export const resolveValues = (f) => (a) => tsplus_module_3.flatMap(values => tsplus_module_3.flatMap(r => tsplus_module_3.productAll(values.map((a) => tsplus_module_3.fromNullable(f(a, r)))))(resolved(a)))(tsplus_module_3.flatMapNullable((a) => a.values)(tsplus_module_3.fromNullable(a.data)));
+export const resolveValues = (f) => (a) => tsplus_module_1.flatMap(values => tsplus_module_1.flatMap(r => Option.productAll(values.map((a) => Option.fromNullable(f(a, r)))))(resolved(a)))(tsplus_module_1.flatMapNullable((a) => a.values)(Option.fromNullable(a.data)));
 const extractComponents = (c) => {
     if ("components" in c) {
         return [...c.components, ...c.components.flatMap(extractComponents)];
@@ -75,22 +74,22 @@ export const components = (a) => [
 /**
  * A lens for accessing the components in a interaction.
  */
-export const componentsWithValue = tsplus_module_2.flow(components, Arr.filter((c) => "value" in c && c.value !== undefined));
+export const componentsWithValue = flow(components, Arr.filter((c) => "value" in c && c.value !== undefined));
 /**
  * Return the interaction components as an id / value map.
  */
-export const transformComponents = (options) => options.reduce((map, c) => (c.custom_id ? tsplus_module_4.set(c.custom_id, c.value)(map) : map), tsplus_module_4.empty());
+export const transformComponents = (options) => options.reduce((map, c) => (c.custom_id ? tsplus_module_2.set(c.custom_id, c.value)(map) : map), HashMap.empty());
 /**
  * Return the interaction components as an id / value map.
  */
-export const componentsMap = tsplus_module_2.flow(components, transformComponents);
+export const componentsMap = flow(components, transformComponents);
 /**
  * Try find a matching component from the interaction.
  */
-export const getComponent = (id) => tsplus_module_2.flow(components, Arr.findFirst((o) => o.custom_id === id));
+export const getComponent = (id) => flow(components, Arr.findFirst((o) => o.custom_id === id));
 /**
  * Try find a matching component value from the interaction.
  */
-export const componentValue = (id) => tsplus_module_2.flow(getComponent(id), (o) => tsplus_module_3.flatMapNullable((o) => o.value)(o));
+export const componentValue = (id) => flow(getComponent(id), (o) => tsplus_module_1.flatMapNullable((o) => o.value)(o));
 export const response = (r) => r;
 //# sourceMappingURL=interactions.js.map

package/Helpers/interactions.js.map

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

package/Helpers/members.d.ts

@@ -2,8 +2,8 @@ import { Discord } from "dfx";
 /**
  * From a list of roles, filter out the ones the guild member has.
  */
-export declare const roles: (roles: Discord.Role[]) => (member: Discord.GuildMember) => import("../types.js").Role[];
+export declare const roles: (roles: Discord.Role[]) => (member: Discord.GuildMember) => Discord.Role[];
 /**
  * Type-guard function for checking if the object is a guild member
  */
-export declare const is: (thing: unknown) => thing is import("../types.js").GuildMember;
+export declare const is: (thing: unknown) => thing is Discord.GuildMember;

package/Helpers/members.js.map

@@ -1 +1 @@
-{"version":3,"file":"members.js","sourceRoot":"","sources":["../../src/Helpers/members.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,KAAqB,EAAE,EAAE,CAAC,CAAC,MAA2B,EAAE,EAAE,CAC9E,KAAK,CAAC,MAAM,CACV,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,CACtE,CAAA;AAEH;;GAEG;AACH,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAc,EAAgC,EAAE,CACjE,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC;IACpD,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA"}
+{"version":3,"file":"members.js","sourceRoot":"","sources":["../../src/Helpers/members.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,KAAqB,EAAE,EAAE,CAAC,CAAC,MAA2B,EAAE,EAAE,CAC9E,KAAK,CAAC,MAAM,CACV,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,CACtE,CAAA;AAEH;;GAEG;AACH,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAc,EAAgC,EAAE,CACjE,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC;IACpD,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA"}

package/Helpers/permissions.d.ts

@@ -1,5 +1,5 @@
 import { Discord } from "dfx";
-import { Effect } from "dfx/utils/common";
+import { Effect } from "dfx/_common";
 /**
  * A constant of all the permissions
  */
@@ -34,8 +34,8 @@ export declare const forChannel: (roles: Discord.Role[]) => ({ guild_id, permiss
  */
 export declare const applyOverwrites: (permissions: bigint) => (overwrites: Discord.Overwrite[]) => bigint;
 interface RolesCache<E> {
-    getForParent: (parentId: string) => Effect<never, E, ReadonlyMap<string, Discord.Role>>;
+    getForParent: (parentId: string) => Effect.Effect<never, E, ReadonlyMap<string, Discord.Role>>;
 }
-export declare const hasInChannel: <E>(rolesCache: RolesCache<E>, permission: bigint) => (channel: Discord.Channel, memberOrRole: Discord.GuildMember | Discord.Role) => import("../utils/common.js").Effect<never, E, boolean>;
-export declare const hasInGuild: <E>(rolesCache: RolesCache<E>, permission: bigint) => (guildId: Discord.Snowflake, member: Discord.GuildMember) => import("../utils/common.js").Effect<never, E, boolean>;
+export declare const hasInChannel: <E>(rolesCache: RolesCache<E>, permission: bigint) => (channel: Discord.Channel, memberOrRole: Discord.GuildMember | Discord.Role) => Effect.Effect<never, E, boolean>;
+export declare const hasInGuild: <E>(rolesCache: RolesCache<E>, permission: bigint) => (guildId: Discord.Snowflake, member: Discord.GuildMember) => Effect.Effect<never, E, boolean>;
 export {};

package/Helpers/permissions.js

@@ -1,22 +1,22 @@
-import * as tsplus_module_1 from "dfx";
-import * as tsplus_module_2 from "dfx/utils/common";
-import * as tsplus_module_3 from "@effect/io/Effect";
+import * as tsplus_module_1 from "@effect/io/Effect";
+import { Discord, Flags, Members } from "dfx";
+import { pipe } from "dfx/_common";
 /**
  * A constant of all the permissions
  */
-export const ALL = tsplus_module_1.Flags.all(tsplus_module_1.Discord.PermissionFlag);
+export const ALL = Flags.all(Discord.PermissionFlag);
 /**
  * Check if a flag exists in the permissions.
  */
-export const has = tsplus_module_1.Flags.hasBigInt;
+export const has = Flags.hasBigInt;
 /**
  * Convert a permissions bitfield to a list of flag names.
  */
-export const toList = tsplus_module_1.Flags.toList(tsplus_module_1.Discord.PermissionFlag);
+export const toList = Flags.toList(Discord.PermissionFlag);
 /**
  * Convert a list of flag names to a bitfield.
  */
-export const fromList = tsplus_module_1.Flags.fromListBigint(tsplus_module_1.Discord.PermissionFlag);
+export const fromList = Flags.fromListBigint(Discord.PermissionFlag);
 /**
  * Reduce a list of roles to a bitfield of all the permissions added together.
  */
@@ -24,7 +24,7 @@ export const forRoles = (roles) => roles.reduce((permissions, role) => permissio
 /**
  * From a list of roles, calculate the permissions bitfield for the member.
  */
-export const forMember = (roles) => (member) => tsplus_module_2.pipe(tsplus_module_1.Members.roles(roles)(member), forRoles);
+export const forMember = (roles) => (member) => pipe(Members.roles(roles)(member), forRoles);
 const overwriteIsForMember = (guildId) => (member) => (overwrite) => {
     if (overwrite.type === 0) {
         return overwrite.id === guildId || member.roles.includes(overwrite.id);
@@ -42,13 +42,13 @@ const overwriteIsForRole = (guildId) => (role) => (overwrite) => {
  * the guild member or role for that channel.
  */
 export const forChannel = (roles) => ({ guild_id, permission_overwrites: overwrites = [] }) => (memberOrRole) => {
-    const hasAdmin = has(tsplus_module_1.Discord.PermissionFlag.ADMINISTRATOR);
+    const hasAdmin = has(Discord.PermissionFlag.ADMINISTRATOR);
     let basePermissions;
     let filteredOverwrites;
-    if (tsplus_module_1.Members.is(memberOrRole)) {
+    if (Members.is(memberOrRole)) {
         if (memberOrRole.permissions)
             return BigInt(memberOrRole.permissions);
-        const memberRoles = tsplus_module_1.Members.roles(roles)(memberOrRole);
+        const memberRoles = Members.roles(roles)(memberOrRole);
         basePermissions = forRoles(memberRoles);
         filteredOverwrites = overwrites.filter(overwriteIsForMember(guild_id)(memberOrRole));
     }
@@ -67,11 +67,11 @@ export const forChannel = (roles) => ({ guild_id, permission_overwrites: overwri
  * Apply permission overwrites to a bitfield.
  */
 export const applyOverwrites = (permissions) => (overwrites) => overwrites.reduce((permissions, overwrite) => (permissions & ~BigInt(overwrite.deny)) | BigInt(overwrite.allow), permissions);
-export const hasInChannel = (rolesCache, permission) => (channel, memberOrRole) => tsplus_module_3.map(roles => {
+export const hasInChannel = (rolesCache, permission) => (channel, memberOrRole) => tsplus_module_1.map(roles => {
     const channelPerms = forChannel([...roles.values()])(channel)(memberOrRole);
     return has(permission)(channelPerms);
 })(rolesCache.getForParent(channel.guild_id));
-export const hasInGuild = (rolesCache, permission) => (guildId, member) => tsplus_module_3.map(roles => {
+export const hasInGuild = (rolesCache, permission) => (guildId, member) => tsplus_module_1.map(roles => {
     const hasPerm = has(permission);
     return member.roles.some((id) => {
         const role = roles.get(id);

package/Helpers/permissions.js.map

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

package/Http/index.d.ts

@@ -1,16 +1,17 @@
+import { Context, Effect, Layer } from "dfx/_common";
 declare const make: () => {
-    request: (url: URL | string, init?: RequestInit) => import("../utils/common.js").Effect<never, FetchError | StatusCodeError, Response>;
-    requestWithJson: <A = unknown>(url: URL | string, init?: RequestInit) => import("../utils/common.js").Effect<never, FetchError | StatusCodeError, {
+    request: (url: URL | string, init?: RequestInit) => Effect.Effect<never, FetchError | StatusCodeError, Response>;
+    requestWithJson: <A = unknown>(url: URL | string, init?: RequestInit) => Effect.Effect<never, FetchError | StatusCodeError, {
         response: Response;
-        json: import("../utils/common.js").Effect<never, JsonParseError, A>;
-        blob: import("../utils/common.js").Effect<never, BlobError, Blob>;
-        text: import("../utils/common.js").Effect<never, never, string>;
+        json: Effect.Effect<never, JsonParseError, A>;
+        blob: Effect.Effect<never, BlobError, Blob>;
+        text: Effect.Effect<never, never, string>;
     }>;
 };
 export interface Http extends ReturnType<typeof make> {
 }
-export declare const Http: import("../utils/common.js").Tag<Http>;
-export declare const LiveHttp: import("../utils/common.js").Layer<never, never, Http>;
+export declare const Http: Context.Tag<Http>;
+export declare const LiveHttp: Layer.Layer<never, never, Http>;
 export declare class FetchError {
     readonly reason: unknown;
     readonly _tag = "FetchError";
@@ -27,11 +28,11 @@ export declare class JsonParseError {
     readonly _tag = "JsonParseError";
     constructor(reason: unknown);
 }
-export declare const json: <A = unknown>(r: Response) => import("../utils/common.js").Effect<never, JsonParseError, A>;
+export declare const json: <A = unknown>(r: Response) => Effect.Effect<never, JsonParseError, A>;
 export declare class BlobError {
     readonly reason: unknown;
     readonly _tag = "BlobError";
     constructor(reason: unknown);
 }
-export declare const blob: (r: Response) => import("../utils/common.js").Effect<never, BlobError, Blob>;
+export declare const blob: (r: Response) => Effect.Effect<never, BlobError, Blob>;
 export {};

package/Http/index.js

@@ -1,8 +1,7 @@
 import * as tsplus_module_1 from "@effect/io/Effect";
-import * as tsplus_module_2 from "dfx/utils/common";
-import * as tsplus_module_3 from "@effect/io/Layer";
+import { Context, Effect, Layer, } from "dfx/_common";
 const make = () => {
-    const request = (url, init = {}) => tsplus_module_1.filterOrElseWith((r) => r.status < 300, (r) => tsplus_module_1.fail(new StatusCodeError(r)))(tsplus_module_1.tryCatchPromiseAbort((signal) => fetch(url, {
+    const request = (url, init = {}) => tsplus_module_1.filterOrElseWith((r) => r.status < 300, (r) => Effect.fail(new StatusCodeError(r)))(Effect.tryCatchPromiseInterrupt((signal) => fetch(url, {
         ...init,
         signal,
     }), (e) => new FetchError(e)));
@@ -10,12 +9,12 @@ const make = () => {
         response,
         json: json(response),
         blob: blob(response),
-        text: tsplus_module_1.promise(() => response.text()),
+        text: Effect.promise(() => response.text()),
     }))(request(url, init));
     return { request, requestWithJson };
 };
-export const Http = tsplus_module_2.Tag();
-export const LiveHttp = tsplus_module_3.sync(Http)(make);
+export const Http = Context.Tag();
+export const LiveHttp = Layer.sync(Http)(make);
 export class FetchError {
     reason;
     _tag = "FetchError";
@@ -39,7 +38,7 @@ export class JsonParseError {
         this.reason = reason;
     }
 }
-export const json = (r) => tsplus_module_1.tryCatchPromise(() => r.json(), (reason) => new JsonParseError(reason));
+export const json = (r) => Effect.tryCatchPromise(() => r.json(), (reason) => new JsonParseError(reason));
 export class BlobError {
     reason;
     _tag = "BlobError";
@@ -47,5 +46,5 @@ export class BlobError {
         this.reason = reason;
     }
 }
-export const blob = (r) => tsplus_module_1.tryCatchPromise(() => r.blob(), (reason) => new BlobError(reason));
+export const blob = (r) => Effect.tryCatchPromise(() => r.blob(), (reason) => new BlobError(reason));
 //# sourceMappingURL=index.js.map

package/Http/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Http/index.ts"],"names":[],"mappings":";;;AAAA,MAAM,IAAI,GAAG,GAAG,EAAE;IAChB,MAAM,OAAO,GAAG,CAAC,GAAiB,EAAE,OAAoB,EAAE,EAAE,EAAE,CAC5D,iCAQE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,GAAG,EACrB,CAAC,CAAC,EAAE,EAAE,CAAC,qBAAY,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC,EAT5C,qCACE,CAAC,MAAM,EAAE,EAAE,CACT,KAAK,CAAC,GAAG,EAAE;QACT,GAAG,IAAI;QACP,MAAM;KACP,CAAC,EACJ,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CACzB,CAGA,CAAA;IAEH,MAAM,eAAe,GAAG,CACtB,GAAiB,EACjB,OAAoB,EAAE,EACtB,EAAE,CACF,oBAAuB,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACpC,QAAQ;QACR,IAAI,EAAE,IAAI,CAAI,QAAQ,CAAC;QACvB,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC;QACpB,IAAI,EAAE,wBAAe,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;KAC5C,CAAC,EALF,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAKf,CAAA;IAEL,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,CAAA;AACrC,CAAC,CAAA;AAGD,MAAM,CAAC,MAAM,IAAI,GAAG,gBAAA,GAAG,EAAQ,CAAA;AAC/B,MAAM,CAAC,MAAM,QAAQ,GAAG,qBAAW,IAAI,CAAC,CAAC,IAAI,CAAC,CAAA;AAE9C,MAAM,OAAO,UAAU;IAEA;IADZ,IAAI,GAAG,YAAY,CAAA;IAC5B,YAAqB,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;CACzC;AAED,MAAM,OAAO,eAAe;IAGL;IAFZ,IAAI,GAAG,iBAAiB,CAAA;IACxB,IAAI,CAAQ;IACrB,YAAqB,QAAkB;QAAlB,aAAQ,GAAR,QAAQ,CAAU;QACrC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAA;IAC7B,CAAC;CACF;AAED,MAAM,OAAO,cAAc;IAEJ;IADZ,IAAI,GAAG,gBAAgB,CAAA;IAChC,YAAqB,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;CACzC;AAED,MAAM,CAAC,MAAM,IAAI,GAAG,CAAc,CAAW,EAAE,EAAE,CAC/C,gCACE,GAAe,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,EAC1B,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,cAAc,CAAC,MAAM,CAAC,CACvC,CAAA;AAEH,MAAM,OAAO,SAAS;IAEC;IADZ,IAAI,GAAG,WAAW,CAAA;IAC3B,YAAqB,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;CACzC;AAED,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,CAAW,EAAE,EAAE,CAClC,gCACE,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,EACd,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,CAClC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Http/index.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,OAAO,EAGP,MAAM,EACN,KAAK,GAON,MAAM,aAAa,CAAA;AAEpB,MAAM,IAAI,GAAG,GAAG,EAAE;IAChB,MAAM,OAAO,GAAG,CAAC,GAAiB,EAAE,OAAoB,EAAE,EAAE,EAAE,CAC5D,iCAQE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,GAAG,EACrB,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC,EAT5C,MAAM,CAAC,wBAAwB,CAC7B,CAAC,MAAM,EAAE,EAAE,CACT,KAAK,CAAC,GAAG,EAAE;QACT,GAAG,IAAI;QACP,MAAM;KACP,CAAC,EACJ,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CACzB,CAGA,CAAA;IAEH,MAAM,eAAe,GAAG,CACtB,GAAiB,EACjB,OAAoB,EAAE,EACtB,EAAE,CACF,oBAAuB,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACpC,QAAQ;QACR,IAAI,EAAE,IAAI,CAAI,QAAQ,CAAC;QACvB,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC;QACpB,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;KAC5C,CAAC,EALF,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAKf,CAAA;IAEL,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,CAAA;AACrC,CAAC,CAAA;AAGD,MAAM,CAAC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,EAAQ,CAAA;AACvC,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAA;AAE9C,MAAM,OAAO,UAAU;IAEA;IADZ,IAAI,GAAG,YAAY,CAAA;IAC5B,YAAqB,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;CACzC;AAED,MAAM,OAAO,eAAe;IAGL;IAFZ,IAAI,GAAG,iBAAiB,CAAA;IACxB,IAAI,CAAQ;IACrB,YAAqB,QAAkB;QAAlB,aAAQ,GAAR,QAAQ,CAAU;QACrC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAA;IAC7B,CAAC;CACF;AAED,MAAM,OAAO,cAAc;IAEJ;IADZ,IAAI,GAAG,gBAAgB,CAAA;IAChC,YAAqB,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;CACzC;AAED,MAAM,CAAC,MAAM,IAAI,GAAG,CAAc,CAAW,EAAE,EAAE,CAC/C,MAAM,CAAC,eAAe,CACpB,GAAe,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,EAC1B,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,cAAc,CAAC,MAAM,CAAC,CACvC,CAAA;AAEH,MAAM,OAAO,SAAS;IAEC;IADZ,IAAI,GAAG,WAAW,CAAA;IAC3B,YAAqB,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;CACzC;AAED,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,CAAW,EAAE,EAAE,CAClC,MAAM,CAAC,eAAe,CACpB,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,EACd,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,CAClC,CAAA"}