dfx 0.15.2 → 0.15.3

package/DiscordGateway/Shard/heartbeats.d.ts

@@ -1,7 +1,6 @@
 import { Ref } from "@effect/io/Ref";
-import { Maybe } from "@fp-ts/data/Option";
+import { Maybe, Discord } from "dfx";
 import { Effect } from "@effect/io/Effect";
 import { DiscordWS } from "dfx/gateway";
 import { EffectSource } from "callbag-effect-ts/Source";
-import { Discord } from "dfx";
 export declare const fromRaw: <R, E>(source: import("callbag-effect-ts/Source").EffectSource<R, E, import("../../types.js").GatewayPayload<any>>, seqRef: Ref<Maybe<number>>) => import("callbag-effect-ts/Source").EffectSource<R, E, import("../DiscordWS/index.js").Message>;

package/DiscordGateway/Shard/identify.d.ts

@@ -1,6 +1,5 @@
-import { Discord } from "dfx";
+import { Discord, Maybe } from "dfx";
 import { Ref } from "@effect/io/Ref";
-import { Maybe } from "@fp-ts/data/Option";
 import { EffectSource } from "callbag-effect-ts/Source";
 export interface Options {
     token: string;

package/DiscordGateway/Shard/invalidSession.d.ts

@@ -1,6 +1,5 @@
 import { EffectSource } from "callbag-effect-ts/Source";
-import { Discord } from "dfx";
+import { Discord, Maybe } from "dfx";
 import { Ref } from "@effect/io/Ref";
-import { Maybe } from "@fp-ts/data/Option";
 import { DiscordWS } from "dfx/gateway";
 export declare const fromRaw: <R, E>(raw: import("callbag-effect-ts/Source").EffectSource<R, E, import("../../types.js").GatewayPayload<any>>, latestReady: Ref<Maybe<Discord.ReadyEvent>>) => import("callbag-effect-ts/Source").EffectSource<R, E, import("../DiscordWS/index.js").Message>;

package/DiscordGateway/Shard/utils.d.ts

@@ -1,6 +1,5 @@
 import { EffectSource } from "callbag-effect-ts/Source";
-import { Discord } from "dfx";
-import { Maybe } from "@fp-ts/data/Option";
+import { Discord, Maybe } from "dfx";
 import { Ref } from "@effect/io/Ref";
 export declare const opCode: <R, E>(source: import("callbag-effect-ts/Source").EffectSource<R, E, import("../../types.js").GatewayPayload<any>>) => <T = any>(code: Discord.GatewayOpcode) => import("callbag-effect-ts/Source").EffectSource<R, E, import("../../types.js").GatewayPayload<T>>;
-export declare const latest: <T>(f: (p: Discord.GatewayPayload) => import("../../global.js").Maybe<T>) => import("../../global.js").Effect<never, never, readonly [import("../../global.js").Ref<import("../../global.js").Maybe<T>>, (p: import("../../types.js").GatewayPayload<any>) => import("../../global.js").Effect<never, never, void>]>;
+export declare const latest: <T>(f: (p: Discord.GatewayPayload) => import("../../index.js").Maybe<T>) => import("../../global.js").Effect<never, never, readonly [import("../../global.js").Ref<import("../../index.js").Maybe<T>>, (p: import("../../types.js").GatewayPayload<any>) => import("../../global.js").Effect<never, never, void>]>;

package/DiscordGateway/ShardStore/index.d.ts

@@ -1,5 +1,5 @@
 import { Effect } from "@effect/io/Effect";
-import { Maybe } from "@fp-ts/data/Option";
+import { Maybe } from "dfx";
 export interface ClaimIdContext {
     sharderCount: number;
     totalCount: number;

package/DiscordGateway/Sharder/index.d.ts

@@ -1,7 +1,6 @@
 import { Effect } from "@effect/io/Effect";
-import { Maybe } from "@fp-ts/data/Option";
+import { Maybe, Discord } from "dfx";
 import { EffectSource } from "callbag-effect-ts/Source";
-import { Discord } from "dfx";
 import { ShardStore } from "../ShardStore/index.js";
 export declare const spawn: import("callbag-effect-ts/Source").EffectSource<import("../../Log/index.js").Log | import("../DiscordWS/index.js").DiscordWSCodec | import("../../DiscordConfig/index.js").DiscordConfig | import("../../RateLimitStore/index.js").RateLimiter | ShardStore | import("../../index.js").DiscordREST, never, {
     run: import("../../global.js").Effect<never, never, void>;

package/DiscordREST/utils.d.ts

@@ -1,7 +1,7 @@
 export declare const routeFromConfig: (path: string, init: RequestInit) => string;
-export declare const numberHeader: (headers: Headers) => (key: string) => import("../global.js").Maybe<number>;
-export declare const retryAfter: (headers: Headers) => import("../global.js").Maybe<import("../global.js").Duration>;
-export declare const rateLimitFromHeaders: (headers: Headers) => import("../global.js").Maybe<{
+export declare const numberHeader: (headers: Headers) => (key: string) => import("../index.js").Maybe<number>;
+export declare const retryAfter: (headers: Headers) => import("../index.js").Maybe<import("../global.js").Duration>;
+export declare const rateLimitFromHeaders: (headers: Headers) => import("../index.js").Maybe<{
     readonly bucket: string;
     readonly retryAfter: import("../global.js").Duration;
     readonly limit: number;

package/Helpers/interactions.d.ts

@@ -1,5 +1,4 @@
-import { Discord } from "dfx";
-import { Maybe } from "@fp-ts/data/Option";
+import { Discord, Maybe } from "dfx";
 /**
  * Maybe find a sub-command within the interaction options.
  */
@@ -7,7 +6,7 @@ export declare const allSubCommands: (interaction: Discord.ApplicationCommandDat
 /**
  * Maybe find a sub-command within the interaction options.
  */
-export declare const findSubCommand: (name: string) => (interaction: Discord.ApplicationCommandDatum) => import("../global.js").Maybe<import("../types.js").ApplicationCommandInteractionDataOption>;
+export declare const findSubCommand: (name: string) => (interaction: Discord.ApplicationCommandDatum) => import("../index.js").Maybe<import("../types.js").ApplicationCommandInteractionDataOption>;
 /**
  * If the sub-command exists return `true`, else `false`.
  */
@@ -15,7 +14,7 @@ export declare const isSubCommand: (name: string) => (interaction: import("../ty
 /**
  * Maybe get the options for a sub-command
  */
-export declare const subCommandOptions: (name: string) => (interaction: import("../types.js").ApplicationCommandDatum) => import("../global.js").Maybe<import("../types.js").ApplicationCommandInteractionDataOption[]>;
+export declare const subCommandOptions: (name: string) => (interaction: import("../types.js").ApplicationCommandDatum) => import("../index.js").Maybe<import("../types.js").ApplicationCommandInteractionDataOption[]>;
 /**
  * A lens for accessing nested options in a interaction.
  */
@@ -31,27 +30,27 @@ export declare const optionsMap: (data: Pick<import("../types.js").ApplicationCo
 /**
  * Try find a matching option from the interaction.
  */
-export declare const getOption: (name: string) => (data: Pick<import("../types.js").ApplicationCommandDatum, "options">) => import("../global.js").Maybe<import("../types.js").ApplicationCommandInteractionDataOption>;
+export declare const getOption: (name: string) => (data: Pick<import("../types.js").ApplicationCommandDatum, "options">) => import("../index.js").Maybe<import("../types.js").ApplicationCommandInteractionDataOption>;
 /**
  * Try find a matching option from the interaction.
  */
-export declare const focusedOption: (data: Pick<import("../types.js").ApplicationCommandDatum, "options">) => import("../global.js").Maybe<import("../types.js").ApplicationCommandInteractionDataOption>;
+export declare const focusedOption: (data: Pick<import("../types.js").ApplicationCommandDatum, "options">) => import("../index.js").Maybe<import("../types.js").ApplicationCommandInteractionDataOption>;
 /**
  * Try find a matching option value from the interaction.
  */
-export declare const optionValue: (name: string) => (data: Pick<import("../types.js").ApplicationCommandDatum, "options">) => import("../global.js").Maybe<string>;
+export declare const optionValue: (name: string) => (data: Pick<import("../types.js").ApplicationCommandDatum, "options">) => import("../index.js").Maybe<string>;
 /**
  * Try extract resolved data
  */
-export declare const resolved: (data: Discord.Interaction) => import("../global.js").Maybe<import("../types.js").ResolvedDatum>;
+export declare const resolved: (data: Discord.Interaction) => import("../index.js").Maybe<import("../types.js").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("../global.js").Maybe<T>;
+export declare const resolveOptionValue: <T>(name: string, f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => T | undefined) => (a: Discord.Interaction) => import("../index.js").Maybe<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("../global.js").Maybe<readonly T[]>;
+export declare const resolveValues: <T>(f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => T | undefined) => (a: Discord.Interaction) => import("../index.js").Maybe<readonly T[]>;
 /**
  * A lens for accessing the components in a interaction.
  */
@@ -71,11 +70,11 @@ export declare const componentsMap: (a: import("../types.js").ModalSubmitDatum)
 /**
  * Try find a matching component from the interaction.
  */
-export declare const getComponent: (id: string) => (a: import("../types.js").ModalSubmitDatum) => import("../global.js").Maybe<import("../types.js").Component>;
+export declare const getComponent: (id: string) => (a: import("../types.js").ModalSubmitDatum) => import("../index.js").Maybe<import("../types.js").Component>;
 /**
  * Try find a matching component value from the interaction.
  */
-export declare const componentValue: (id: string) => (a: import("../types.js").ModalSubmitDatum) => import("../global.js").Maybe<string>;
+export declare const componentValue: (id: string) => (a: import("../types.js").ModalSubmitDatum) => import("../index.js").Maybe<string>;
 export type InteractionResponse = {
     type: Discord.InteractionCallbackType.CHANNEL_MESSAGE_WITH_SOURCE;
     data: Discord.InteractionCallbackMessage;

package/Interactions/context.d.ts

@@ -44,11 +44,11 @@ export declare class RequiredOptionNotFound {
     readonly _tag = "RequiredOptionNotFound";
     constructor(data: Discord.ApplicationCommandDatum | Discord.ApplicationCommandInteractionDataOption, name: string);
 }
-export declare const findOption: (name: string) => Effect<import("../types.js").ApplicationCommandDatum, never, import("../global.js").Maybe<import("../types.js").ApplicationCommandInteractionDataOption>>;
+export declare const findOption: (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("../global.js").Maybe<string>>;
+export declare const optionValueOptional: (name: string) => Effect<import("../types.js").ApplicationCommandDatum, never, import("../index.js").Maybe<string>>;
 export declare const subCommandOptionsMap: Effect<SubCommandContext, never, Record<string, string | undefined>>;
-export declare const findSubCommandOption: (name: string) => Effect<SubCommandContext, never, import("../global.js").Maybe<import("../types.js").ApplicationCommandInteractionDataOption>>;
+export declare const findSubCommandOption: (name: string) => Effect<SubCommandContext, never, import("../index.js").Maybe<import("../types.js").ApplicationCommandInteractionDataOption>>;
 export declare const subCommandOptionValue: (name: string) => Effect<SubCommandContext, RequiredOptionNotFound, string>;
 export declare const subCommandOptionValueOptional: (name: string) => Effect<SubCommandContext, RequiredOptionNotFound, string>;
 export declare const modalValues: Effect<import("../types.js").ModalSubmitDatum, never, Record<string, string | undefined>>;

package/Interactions/definitions.d.ts

@@ -1,5 +1,4 @@
-import { Discord } from "dfx";
-import { Maybe } from "@fp-ts/data/Option";
+import { Discord, Maybe } from "dfx";
 import { Effect, EffectTypeId } from "@effect/io/Effect";
 import { RequiredOptionNotFound, ResolvedDataNotFound, SubCommandContext, SubCommandNotFound } from "./context.js";
 import type { F } from "ts-toolbelt";
@@ -48,12 +47,12 @@ type CommandHandler<R, E, A = any> = Effect<R, E, Discord.InteractionResponse> |
 export interface CommandHelper<A> {
     resolve: <T>(name: Resolvables<A>["name"], f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => T | undefined) => Effect<Discord.Interaction, ResolvedDataNotFound, T>;
     option: (name: CommandOptions<A>["name"]) => Effect<Discord.ApplicationCommandDatum, never, Maybe<Discord.ApplicationCommandInteractionDataOption>>;
-    optionValue: (name: CommandOptions<A>["name"]) => Effect<Discord.ApplicationCommandDatum, RequiredOptionNotFound, string>;
+    optionValue: (name: RequiredCommandOptions<A>["name"]) => Effect<Discord.ApplicationCommandDatum, RequiredOptionNotFound, string>;
     optionValueOptional: (name: CommandOptions<A>["name"]) => Effect<Discord.ApplicationCommandDatum, never, Maybe<string>>;
     subCommandOption: (name: SubCommandOptions<A>["name"]) => Effect<SubCommandContext, never, Maybe<Discord.ApplicationCommandInteractionDataOption>>;
-    subCommandOptionValue: (name: SubCommandOptions<A>["name"]) => Effect<SubCommandContext, RequiredOptionNotFound, string>;
+    subCommandOptionValue: (name: RequiredSubCommandOptions<A>["name"]) => Effect<SubCommandContext, RequiredOptionNotFound, string>;
     subCommandOptionValueOptional: (name: SubCommandOptions<A>["name"]) => Effect<SubCommandContext, never, Maybe<string>>;
-    subCommands: <NER extends Record<SubCommands<A>["name"], Effect<any, any, Discord.InteractionResponse>>>(commands: NER) => Effect<Exclude<[
+    subCommands: <NER extends SubCommands<A> extends never ? never : Record<SubCommands<A>["name"], Effect<any, any, Discord.InteractionResponse>>>(commands: NER) => Effect<Exclude<[
         NER[keyof NER]
     ] extends [
         {
@@ -71,16 +70,24 @@ export interface CommandHelper<A> {
 }
 type CommandHandlerFn<R, E, A> = (i: CommandHelper<A>) => Effect<R, E, Discord.InteractionResponse>;
 type ExtractOptions<A, T> = A extends {
-    name: string;
     type: T;
+    name: string;
     options?: Discord.ApplicationCommandOption[];
-} ? A | (A extends {
-    options: Discord.ApplicationCommandOption[];
-} ? ExtractOptions<A["options"][number], T> : never) : A extends {
+} ? A : A extends {
     options: Discord.ApplicationCommandOption[];
 } ? ExtractOptions<A["options"][number], T> : never;
+type RequiredOptions<A, T> = A extends {
+    options: Discord.ApplicationCommandOption[];
+} ? Extract<A["options"][number], {
+    type: T;
+    required: true;
+}> : never;
 type CommandOptions<A> = ExtractOptions<A, Exclude<Discord.ApplicationCommandOptionType, Discord.ApplicationCommandOptionType.SUB_COMMAND | Discord.ApplicationCommandOptionType.SUB_COMMAND_GROUP>>;
+type RequiredCommandOptions<A> = RequiredOptions<A, Exclude<Discord.ApplicationCommandOptionType, Discord.ApplicationCommandOptionType.SUB_COMMAND | Discord.ApplicationCommandOptionType.SUB_COMMAND_GROUP>>;
 type SubCommands<A> = ExtractOptions<A, Discord.ApplicationCommandOptionType.SUB_COMMAND>;
 type SubCommandOptions<A> = Exclude<SubCommands<A>["options"], undefined>[number];
+type RequiredSubCommandOptions<A> = Extract<Exclude<SubCommands<A>["options"], undefined>[number], {
+    required: true;
+}>;
 type Resolvables<A> = ExtractOptions<A, Discord.ApplicationCommandOptionType.ROLE | Discord.ApplicationCommandOptionType.USER | Discord.ApplicationCommandOptionType.MENTIONABLE | Discord.ApplicationCommandOptionType.CHANNEL>;
 export {};

package/RateLimitStore/index.d.ts

@@ -1,5 +1,5 @@
 import { Effect } from "@effect/io/Effect";
-import { Maybe } from "@fp-ts/data/Option";
+import { Maybe } from "dfx";
 import { Duration } from "@fp-ts/data/Duration";
 import { Success } from "dfx/utils/effect";
 export type BucketDetails = {

package/global.d.ts

@@ -33,7 +33,7 @@ import type { Equal } from "@fp-ts/data/Equal";
 /**
  * @tsplus global
  */
-import type { Option as Maybe } from "@fp-ts/data/Option";
+import type { Maybe } from "dfx";
 /**
  * @tsplus global
  */
@@ -86,5 +86,4 @@ export type { Effect } from "@effect/io/Effect";
 export type { Layer } from "@effect/io/Layer";
 export { Context, Tag } from "@fp-ts/data/Context";
 export type { Duration } from "@fp-ts/data/Duration";
-export type { Option as Maybe } from "@fp-ts/data/Option";
 export type { Ref } from "@effect/io/Ref";

package/index.d.ts

@@ -11,3 +11,4 @@ export * as IxHelpers from "./Helpers/interactions.js";
 export * as Members from "./Helpers/members.js";
 export * as Perms from "./Helpers/permissions.js";
 export * as UI from "./Helpers/ui.js";
+export type { Option as Maybe } from "@fp-ts/data/Option";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dfx",
-  "version": "0.15.2",
+  "version": "0.15.3",
   "type": "module",
   "publishConfig": {
     "access": "public",
@@ -48,5 +48,5 @@
       "@fp-ts/data": "^0.0.20"
     }
   },
-  "gitHead": "9f27f7407977f6effc3705beba3078716e5cea7e"
+  "gitHead": "c834316c54f806a80a87418f6c496dfc190df02d"
 }