dfx 0.87.0 → 0.88.0

package/src/Interactions/definitions.ts

@@ -123,13 +123,14 @@ export const autocomplete = <R1, R2, E1, E2>(
   >(pred as any, handle as any)
 
 // ==== Command handler helpers
-type DeepReadonly<T> = T extends Array<infer R>
-  ? ReadonlyArray<DeepReadonly<R>>
-  : T extends Function
-    ? T
-    : T extends object
-      ? DeepReadonlyObject<T>
-      : T
+type DeepReadonly<T> =
+  T extends Array<infer R>
+    ? ReadonlyArray<DeepReadonly<R>>
+    : T extends Function
+      ? T
+      : T extends object
+        ? DeepReadonlyObject<T>
+        : T
 type DeepReadonlyObject<T> = {
   readonly [P in keyof T]: DeepReadonly<T[P]>
 }
@@ -173,20 +174,24 @@ export interface CommandHelper<A> {
         >,
   >(
     commands: NER,
-  ) => Effect.Effect<Discord.InteractionResponse, [NER[keyof NER]] extends [
-    { [Effect.EffectTypeId]: { _E: (_: never) => infer E } },
-  ]
-    ? E
-    : never, | Exclude<
-      [NER[keyof NER]] extends [
-        { [Effect.EffectTypeId]: { _R: (_: never) => infer R } },
-      ]
-        ? R
-        : never,
-      SubCommandContext
-    >
-  | DiscordInteraction
-  | DiscordApplicationCommand>
+  ) => Effect.Effect<
+    Discord.InteractionResponse,
+    [NER[keyof NER]] extends [
+      { [Effect.EffectTypeId]: { _E: (_: never) => infer E } },
+    ]
+      ? E
+      : never,
+    | Exclude<
+        [NER[keyof NER]] extends [
+          { [Effect.EffectTypeId]: { _R: (_: never) => infer R } },
+        ]
+          ? R
+          : never,
+        SubCommandContext
+      >
+    | DiscordInteraction
+    | DiscordApplicationCommand
+  >
 }
 
 export type CommandHandlerFn<R, E, A> = (

package/src/Interactions/gateway.ts

@@ -37,12 +37,20 @@ export const setInteractionsSync = (enabled: boolean) =>
 export const run =
   <R, R2, E, TE, E2>(
     postHandler: (
-      effect: Effect.Effect<void, TE | DiscordRESTError | DefinitionNotFound, R | DiscordREST | DiscordInteraction>,
+      effect: Effect.Effect<
+        void,
+        TE | DiscordRESTError | DefinitionNotFound,
+        R | DiscordREST | DiscordInteraction
+      >,
     ) => Effect.Effect<void, E2, R2>,
   ) =>
   (
     ix: InteractionBuilder<R, E, TE>,
-  ): Effect.Effect<never, E2 | DiscordRESTError | Http.error.ResponseError, DiscordREST | DiscordGateway | Exclude<R2, DiscordInteraction>> =>
+  ): Effect.Effect<
+    never,
+    E2 | DiscordRESTError | Http.error.ResponseError,
+    DiscordREST | DiscordGateway | Exclude<R2, DiscordInteraction>
+  > =>
     Effect.gen(function* (_) {
       const GlobalApplicationCommand = ix.definitions.pipe(
         Chunk.map(_ => _[0]),
@@ -65,8 +73,7 @@ export const run =
       const rest = yield* _(DiscordREST)
 
       const application = yield* _(
-        rest.getCurrentBotApplicationInformation(),
-        Effect.flatMap(a => a.json),
+        rest.getCurrentBotApplicationInformation().json,
       )
 
       const globalSync = rest.bulkOverwriteGlobalApplicationCommands(
@@ -76,20 +83,22 @@ export const run =
             GlobalApplicationCommand.map(_ => _.command),
           ),
         },
-      )
+      ).asUnit
 
       const guildSync = GuildApplicationCommand.length
-        ? gateway.handleDispatch("GUILD_CREATE", a =>
-            rest.bulkOverwriteGuildApplicationCommands(
-              application.id,
-              a.id,
-              GuildApplicationCommand.map(_ => _.command) as any,
-            ),
+        ? gateway.handleDispatch(
+            "GUILD_CREATE",
+            a =>
+              rest.bulkOverwriteGuildApplicationCommands(
+                application.id,
+                a.id,
+                GuildApplicationCommand.map(_ => _.command) as any,
+              ).asUnit,
           )
         : Effect.never
 
       const handle = handlers(ix.definitions, (i, r) =>
-        rest.createInteractionResponse(i.id, i.token, r),
+        rest.createInteractionResponse(i.id, i.token, r).pipe(Effect.scoped),
       )
 
       const run = gateway.handleDispatch("INTERACTION_CREATE", i =>

package/src/Interactions/handlers.ts

@@ -12,7 +12,11 @@ export class DefinitionNotFound {
   constructor(readonly interaction: Discord.Interaction) {}
 }
 
-type Handler<R, E, A> = Effect.Effect<A, E | DefinitionNotFound, R | Ctx.DiscordInteraction>
+type Handler<R, E, A> = Effect.Effect<
+  A,
+  E | DefinitionNotFound,
+  R | Ctx.DiscordInteraction
+>
 
 export const handlers = <R, E, TE, A, B>(
   definitions: Chunk.Chunk<

package/src/Interactions/utils.ts

@@ -4,16 +4,14 @@ import * as Ctx from "dfx/Interactions/context"
 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,
-  E
-> extends infer D
-  ? {
-      [K in keyof D]: K extends "handle"
-        ? (_: Discord.Interaction) => Effect.Effect<A, TE, R>
-        : D[K]
-    }
-  : never
+export type DefinitionFlattened<R, E, TE, A> =
+  D.InteractionDefinition<R, E> extends infer D
+    ? {
+        [K in keyof D]: K extends "handle"
+          ? (_: Discord.Interaction) => Effect.Effect<A, TE, R>
+          : D[K]
+      }
+    : never
 
 export type DefinitionFlattenedCommand<R, E, TE, A> = Extract<
   DefinitionFlattened<R, E, TE, A>,
@@ -83,10 +81,10 @@ export const splitDefinitions = <R, E, TE, A>(
     Chunk.reduce(
       {} as Record<string, DefinitionFlattenedCommand<R, E, TE, A>>,
       (acc, d) =>
-        (({
+        ({
           ...acc,
-          [d.command.name]: d
-        }) as any),
+          [d.command.name]: d,
+        }) as any,
     ),
   )
 

package/src/Interactions/webhook.ts

@@ -74,9 +74,10 @@ const makeConfig = ({
 export interface WebhookConfig {
   readonly _: unique symbol
 }
-export const WebhookConfig = GenericTag<WebhookConfig, ReturnType<typeof makeConfig>>(
-  "dfx/Interactions/WebhookConfig",
-)
+export const WebhookConfig = GenericTag<
+  WebhookConfig,
+  ReturnType<typeof makeConfig>
+>("dfx/Interactions/WebhookConfig")
 
 export const layer = (opts: MakeConfigOpts) =>
   Layer.succeed(WebhookConfig, makeConfig(opts))
@@ -122,14 +123,18 @@ const run = <R, E>(
   return (
     headers: Headers,
     body: string,
-  ): Effect.Effect<Discord.InteractionResponse, BadWebhookSignature | WebhookParseError | E | DefinitionNotFound, WebhookConfig | Exclude<R, DiscordInteraction>> =>
+  ): Effect.Effect<
+    Discord.InteractionResponse,
+    BadWebhookSignature | WebhookParseError | E | DefinitionNotFound,
+    WebhookConfig | Exclude<R, DiscordInteraction>
+  > =>
     Effect.flatMap(fromHeadersAndBody(headers, body), interaction =>
       Effect.provideService(
         handler[interaction.type](interaction),
         Interaction,
         interaction,
       ),
-    );
+    )
 }
 
 export interface HandleWebhookOpts<E> {
@@ -168,7 +173,7 @@ export const makeHandler = <R, E, TE>(
     handle(headers, body).pipe(
       Effect.flatMap(success),
       Effect.catchAllCause(error),
-    );
+    )
 }
 
 /**

package/src/utils/Effect.ts

@@ -29,7 +29,7 @@ export const subscribeForEachPar = <R, E, A, X>(
     return Effect.all([run, Deferred.await(deferred)], {
       concurrency: "unbounded",
       discard: true,
-    }) as Effect.Effect<never, E, R>;
+    }) as Effect.Effect<never, E, R>
   })
 
 export const foreverSwitch = <R, E, A, R1, E1, X>(
@@ -64,6 +64,6 @@ export const foreverSwitch = <R, E, A, R1, E1, X>(
       return Effect.all([run, Deferred.await(causeDeferred)], {
         concurrency: "unbounded",
         discard: true,
-      }) as Effect.Effect<never, E | E1, R | R1>;
+      }) as Effect.Effect<never, E | E1, R | R1>
     }),
   )

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "0.87.0";
+export const LIB_VERSION = "0.88.0";

package/version.d.ts

@@ -1,2 +1,2 @@
-export declare const LIB_VERSION = "0.87.0";
+export declare const LIB_VERSION = "0.88.0";
 //# sourceMappingURL=version.d.ts.map

package/version.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.LIB_VERSION = void 0;
-const LIB_VERSION = exports.LIB_VERSION = "0.87.0";
+const LIB_VERSION = exports.LIB_VERSION = "0.88.0";
 //# sourceMappingURL=version.js.map