dfx 0.57.0 → 0.58.1

package/src/Helpers/members.ts

@@ -1,12 +1,13 @@
-import * as Discord from "dfx/types"
+import type * as Discord from "dfx/types"
 
 /**
  * From a list of roles, filter out the ones the guild member has.
  */
-export const roles = (roles: Discord.Role[]) => (member: Discord.GuildMember) =>
-  roles.filter(
-    role => member.roles.includes(role.id) || role.name === "@everyone",
-  )
+export const roles =
+  (roles: Array<Discord.Role>) => (member: Discord.GuildMember) =>
+    roles.filter(
+      role => member.roles.includes(role.id) || role.name === "@everyone",
+    )
 
 /**
  * Type-guard function for checking if the object is a guild member

package/src/Helpers/permissions.ts

@@ -27,7 +27,7 @@ export const fromList = Flags.fromListBigint(Discord.PermissionFlag)
 /**
  * Reduce a list of roles to a bitfield of all the permissions added together.
  */
-export const forRoles = (roles: Discord.Role[]) =>
+export const forRoles = (roles: Array<Discord.Role>) =>
   roles.reduce(
     (permissions, role) => permissions | BigInt(role.permissions),
     BigInt(0),
@@ -37,7 +37,7 @@ export const forRoles = (roles: Discord.Role[]) =>
  * From a list of roles, calculate the permissions bitfield for the member.
  */
 export const forMember =
-  (roles: Discord.Role[]) => (member: Discord.GuildMember) =>
+  (roles: Array<Discord.Role>) => (member: Discord.GuildMember) =>
     pipe(Members.roles(roles)(member), forRoles)
 
 const overwriteIsForMember =
@@ -66,12 +66,12 @@ const overwriteIsForRole =
  * the guild member or role for that channel.
  */
 export const forChannel =
-  (roles: Discord.Role[]) =>
+  (roles: Array<Discord.Role>) =>
   ({ guild_id, permission_overwrites: overwrites = [] }: Discord.Channel) =>
   (memberOrRole: Discord.GuildMember | Discord.Role) => {
     const hasAdmin = has(Discord.PermissionFlag.ADMINISTRATOR)
     let basePermissions: bigint
-    let filteredOverwrites: Discord.Overwrite[]
+    let filteredOverwrites: Array<Discord.Overwrite>
 
     if (Members.is(memberOrRole)) {
       if (memberOrRole.permissions) return BigInt(memberOrRole.permissions)
@@ -102,7 +102,7 @@ export const forChannel =
  * Apply permission overwrites to a bitfield.
  */
 export const applyOverwrites =
-  (permissions: bigint) => (overwrites: Discord.Overwrite[]) =>
+  (permissions: bigint) => (overwrites: Array<Discord.Overwrite>) =>
     overwrites.reduce(
       (permissions, overwrite) =>
         (permissions & ~BigInt(overwrite.deny)) | BigInt(overwrite.allow),

package/src/Helpers/ui.ts

@@ -1,21 +1,19 @@
-import {
+import type {
   ActionRow,
   Button,
-  ButtonStyle,
   Component,
-  ComponentType,
   SelectMenu,
   SelectOption,
   TextInput,
-  TextInputStyle,
 } from "dfx/types"
+import { ButtonStyle, ComponentType, TextInputStyle } from "dfx/types"
 
 export type UIComponent = Exclude<Component, ActionRow>
 
 /**
  * Helper to create an Action Row grid.
  */
-export const grid = (items: UIComponent[][]): ActionRow[] =>
+export const grid = (items: Array<Array<UIComponent>>): Array<ActionRow> =>
   items.map(
     (components): ActionRow => ({
       type: ComponentType.ACTION_ROW,
@@ -26,7 +24,7 @@ export const grid = (items: UIComponent[][]): ActionRow[] =>
 /**
  * Helper to create a single column of components
  */
-export const singleColumn = (items: UIComponent[]): ActionRow[] =>
+export const singleColumn = (items: Array<UIComponent>): Array<ActionRow> =>
   items.map(c => ({
     type: ComponentType.ACTION_ROW,
     components: [c],
@@ -44,7 +42,7 @@ export const button = (button: Partial<Button>): Button => ({
 type BasicSelect = Omit<SelectMenu, "type" | "channel_types" | "options">
 
 type StringSelect = BasicSelect & {
-  options: SelectOption[]
+  options: Array<SelectOption>
 }
 
 type ChannelSelect = Omit<SelectMenu, "type" | "options">

package/src/Interactions/context.ts

@@ -1,11 +1,10 @@
 import { Tag } from "@effect/data/Context"
-import * as HashMap from "@effect/data/HashMap"
+import type * as HashMap from "@effect/data/HashMap"
 import * as Option from "@effect/data/Option"
 import * as Arr from "@effect/data/ReadonlyArray"
 import * as Effect from "@effect/io/Effect"
 import * as IxHelpers from "dfx/Helpers/interactions"
-import * as Discord from "dfx/types"
-import { ModalSubmitDatum } from "dfx/types"
+import type * as Discord from "dfx/types"
 
 export const Interaction = Tag<Discord.Interaction>()
 export const ApplicationCommand = Tag<Discord.ApplicationCommandDatum>()
@@ -29,7 +28,7 @@ export class ResolvedDataNotFound {
 
 export const resolvedValues = <A>(
   f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => A | undefined,
-): Effect.Effect<Discord.Interaction, ResolvedDataNotFound, readonly A[]> =>
+): Effect.Effect<Discord.Interaction, ResolvedDataNotFound, ReadonlyArray<A>> =>
   Effect.flatMap(Interaction, ix =>
     Effect.mapError(
       IxHelpers.resolveValues(f)(ix),
@@ -150,7 +149,7 @@ export const modalValueOption = (name: string) =>
 
 export class ModalValueNotFound {
   readonly _tag = "ModalValueNotFound"
-  constructor(readonly data: ModalSubmitDatum, readonly name: string) {}
+  constructor(readonly data: Discord.ModalSubmitDatum, readonly name: string) {}
 }
 
 export const modalValue = (name: string) =>

package/src/Interactions/definitions.ts

@@ -1,11 +1,11 @@
-import * as Option from "@effect/data/Option"
-import * as Effect from "@effect/io/Effect"
-import {
+import type * as Option from "@effect/data/Option"
+import type * as Effect from "@effect/io/Effect"
+import type {
   FocusedOptionContext,
   ResolvedDataNotFound,
   SubCommandContext,
 } from "dfx/Interactions/context"
-import * as Discord from "dfx/types"
+import type * as Discord from "dfx/types"
 
 export type InteractionDefinition<R, E> =
   | GlobalApplicationCommand<R, E>
@@ -119,7 +119,7 @@ export const autocomplete = <R1, R2, E1, E2>(
   >(pred as any, handle as any)
 
 // ==== Command handler helpers
-type DeepReadonly<T> = T extends (infer R)[]
+type DeepReadonly<T> = T extends Array<infer R>
   ? ReadonlyArray<DeepReadonly<R>>
   : T extends Function
   ? T

package/src/Interactions/handlers.ts

@@ -1,9 +1,9 @@
-import * as Chunk from "@effect/data/Chunk"
+import type * as Chunk from "@effect/data/Chunk"
 import * as Option from "@effect/data/Option"
 import * as Effect from "@effect/io/Effect"
 import * as IxHelpers from "dfx/Helpers/interactions"
 import * as Ctx from "dfx/Interactions/context"
-import * as D from "dfx/Interactions/definitions"
+import type * as D from "dfx/Interactions/definitions"
 import { flattenDefinitions, splitDefinitions } from "dfx/Interactions/utils"
 import * as Discord from "dfx/types"
 
@@ -35,7 +35,7 @@ export const handlers = <R, E, TE, A, B>(
 > => {
   const flattened = flattenDefinitions(definitions, handleResponse)
 
-  const { Commands, Autocomplete, MessageComponent, ModalSubmit } =
+  const { Autocomplete, Commands, MessageComponent, ModalSubmit } =
     splitDefinitions(flattened)
 
   return {

package/src/Interactions/utils.ts

@@ -1,8 +1,8 @@
 import * as Chunk from "@effect/data/Chunk"
 import * as Effect from "@effect/io/Effect"
 import * as Ctx from "dfx/Interactions/context"
-import * as D from "dfx/Interactions/definitions"
-import * as Discord from "dfx/types"
+import type * as D from "dfx/Interactions/definitions"
+import type * as Discord from "dfx/types"
 
 export type DefinitionFlattened<R, E, TE, A> = D.InteractionDefinition<
   R,

package/src/Interactions/webhook.ts

@@ -2,23 +2,25 @@ import * as Chunk from "@effect/data/Chunk"
 import { Tag } from "@effect/data/Context"
 import { identity } from "@effect/data/Function"
 import * as Option from "@effect/data/Option"
-import * as Cause from "@effect/io/Cause"
-import * as Config from "@effect/io/Config"
-import * as ConfigError from "@effect/io/Config/Error"
+import type * as Cause from "@effect/io/Cause"
+import type * as Config from "@effect/io/Config"
+import type * as ConfigError from "@effect/io/Config/Error"
 import * as ConfigSecret from "@effect/io/Config/Secret"
 import * as Effect from "@effect/io/Effect"
 import * as Layer from "@effect/io/Layer"
-import * as D from "dfx/Interactions/definitions"
-import { DefinitionNotFound, handlers } from "dfx/Interactions/handlers"
-import { Interaction, InteractionBuilder } from "dfx/Interactions/index"
-import * as Discord from "dfx/types"
+import type * as D from "dfx/Interactions/definitions"
+import type { DefinitionNotFound } from "dfx/Interactions/handlers"
+import { handlers } from "dfx/Interactions/handlers"
+import type { InteractionBuilder } from "dfx/Interactions/index"
+import { Interaction } from "dfx/Interactions/index"
+import type * as Discord from "dfx/types"
 import * as Verify from "discord-verify"
 
 export class BadWebhookSignature {
   readonly _tag = "BadWebhookSignature"
 }
 
-export type Headers = Record<string, string | string[] | undefined>
+export type Headers = Record<string, string | Array<string> | undefined>
 
 const checkSignature = (
   publicKey: string,
@@ -55,10 +57,10 @@ export interface MakeConfigOpts {
   readonly algorithm: keyof typeof Verify.PlatformAlgorithm
 }
 const makeConfig = ({
+  algorithm,
   applicationId,
-  publicKey,
   crypto,
-  algorithm,
+  publicKey,
 }: MakeConfigOpts) => ({
   applicationId,
   publicKey: ConfigSecret.value(publicKey),
@@ -84,7 +86,7 @@ export class WebhookParseError {
 }
 
 const fromHeadersAndBody = (headers: Headers, body: string) =>
-  Effect.tap(WebhookConfig, ({ publicKey, crypto, algorithm }) =>
+  Effect.tap(WebhookConfig, ({ algorithm, crypto, publicKey }) =>
     checkSignature(publicKey, headers, body, crypto, algorithm),
   ).pipe(
     Effect.flatMap(() =>
@@ -133,10 +135,10 @@ export interface HandleWebhookOpts<E> {
 export const makeHandler = <R, E, TE>(
   ix: InteractionBuilder<R, E, TE>,
 ): (({
-  headers,
   body,
-  success,
   error,
+  headers,
+  success,
 }: HandleWebhookOpts<
   E | WebhookParseError | BadWebhookSignature | DefinitionNotFound
 >) => Effect.Effect<WebhookConfig, never, void>) => {
@@ -146,10 +148,10 @@ export const makeHandler = <R, E, TE>(
   )
 
   return ({
-    headers,
     body,
-    success,
     error,
+    headers,
+    success,
   }: HandleWebhookOpts<
     E | WebhookParseError | BadWebhookSignature | DefinitionNotFound
   >): Effect.Effect<WebhookConfig, never, void> =>
@@ -165,8 +167,8 @@ export const makeHandler = <R, E, TE>(
 export const makeSimpleHandler = <R, E, TE>(
   ix: InteractionBuilder<R, E, TE>,
 ): (({
-  headers,
   body,
+  headers,
 }: {
   headers: Headers
   body: string
@@ -180,6 +182,6 @@ export const makeSimpleHandler = <R, E, TE>(
     (_i, r) => Effect.succeed(r),
   )
 
-  return ({ headers, body }: { headers: Headers; body: string }) =>
+  return ({ body, headers }: { headers: Headers; body: string }) =>
     handle(headers, body)
 }

package/src/Log.ts

@@ -3,11 +3,11 @@ import * as Layer from "@effect/io/Layer"
 import { Tag } from "@effect/data/Context"
 
 const make = (debug = false) => ({
-  info: (...args: any[]) =>
+  info: (...args: Array<any>) =>
     Effect.sync(() => {
       console.error("INFO", ...args)
     }),
-  debug: (...args: any[]) =>
+  debug: (...args: Array<any>) =>
     debug
       ? Effect.sync(() => {
           console.error("DEBUG", ...args)

package/src/RateLimit/memory.ts

@@ -1,6 +1,6 @@
 import * as Option from "@effect/data/Option"
 import * as Effect from "@effect/io/Effect"
-import { BucketDetails, RateLimitStore } from "dfx/RateLimit"
+import type { BucketDetails, RateLimitStore } from "dfx/RateLimit"
 
 interface Counter {
   count: number

package/src/RateLimit/utils.ts

@@ -1,4 +1,5 @@
-import { Duration, millis, zero } from "@effect/data/Duration"
+import type { Duration } from "@effect/data/Duration"
+import { millis, zero } from "@effect/data/Duration"
 
 export const delayFrom = (
   window: number,

package/src/RateLimit.ts

@@ -1,6 +1,6 @@
 import { Tag } from "@effect/data/Context"
 import * as Duration from "@effect/data/Duration"
-import * as Option from "@effect/data/Option"
+import type * as Option from "@effect/data/Option"
 import * as Effect from "@effect/io/Effect"
 import * as Layer from "@effect/io/Layer"
 import { Log } from "dfx/Log"