dfx 0.9.4 → 0.9.5

package/README.md

@@ -1,3 +1,41 @@
 # dfx
 
-A Discord library for effect-ts
+A Discord library built on top of @effect/io
+
+- Supports both the gateway and webhooks
+- Simple yet powerful abstractions to build Discord bots
+
+## Example
+
+```typescript
+import * as Effect from "@effect/io/Effect"
+import { pipe } from "@fp-ts/data/Function"
+import { Ix, runIxGateway, makeLayer } from "dfx"
+
+// Create the dependencies layer
+const Dependencies = makeLayer({
+  token: "xxx",
+})
+
+// Create hello command that responds with "Hello!"
+const hello = Ix.global(
+  {
+    name: "hello",
+    description: "A basic command",
+  },
+  Effect.succeedSome({
+    type: 4,
+    data: {
+      content: "Hello!",
+    },
+  }),
+)
+
+// Run it
+pipe(
+  Ix.builder.add(hello),
+  runIxGateway((error) => Effect.fail(error)),
+  Effect.providerLayer(Dependencies),
+  Effect.unsafeRunPromise,
+)
+```

package/dist/Interactions/gateway.d.ts

@@ -3,5 +3,5 @@ import { InteractionBuilder } from "./index.js";
 export interface RunOpts {
     sync?: boolean;
 }
-export declare const run: <R, R2, E, E2>(ix: InteractionBuilder<R, E>, catchAll: (e: import("../Http/index.js").FetchError | import("../Http/index.js").StatusCodeError | import("../Http/index.js").JsonParseError | E) => import("../common.js").Effect<R2, E2, any>, { sync }?: RunOpts) => import("../common.js").Effect<import("../index.js").DiscordREST | import("../DiscordGateway/index.js").DiscordGateway | R | R2, import("../Http/index.js").FetchError | import("../Http/index.js").StatusCodeError | import("../Http/index.js").JsonParseError | E2, void>;
+export declare const run: <R2, E, E2>(catchAll: (e: import("../Http/index.js").FetchError | import("../Http/index.js").StatusCodeError | import("../Http/index.js").JsonParseError | E) => import("../common.js").Effect<R2, E2, any>, { sync }?: RunOpts) => <R>(ix: InteractionBuilder<R, E>) => import("../common.js").Effect<import("../index.js").DiscordREST | import("../DiscordGateway/index.js").DiscordGateway | R2 | R, import("../Http/index.js").FetchError | import("../Http/index.js").StatusCodeError | import("../Http/index.js").JsonParseError | E2, void>;
 //# sourceMappingURL=gateway.d.ts.map

package/dist/Interactions/gateway.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../../src/Interactions/gateway.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAG/C,MAAM,WAAW,OAAO;IACtB,IAAI,CAAC,EAAE,OAAO,CAAA;CACf;AAED,eAAO,MAAM,GAAG,2PAKG,OAAO,+QAwCtB,CAAA"}
+{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../../src/Interactions/gateway.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAG/C,MAAM,WAAW,OAAO;IACtB,IAAI,CAAC,EAAE,OAAO,CAAA;CACf;AAED,eAAO,MAAM,GAAG,0NAKK,OAAO,oTAyCtB,CAAA"}

package/dist/Interactions/gateway.js

@@ -4,7 +4,7 @@ import * as tsplus_module_3 from "@fp-ts/data/Option";
 import * as tsplus_module_4 from "dfx/common-gateway";
 import { handlers } from "./handlers.js";
 import { splitDefinitions } from "./utils.js";
-export const run = (ix, catchAll, { sync = true } = {}) => (() => {
+export const run = (catchAll, { sync = true } = {}) => (ix) => (() => {
     const { GlobalApplicationCommand, GuildApplicationCommand } = splitDefinitions(ix.definitions);
     return tsplus_module_1.flatMap(application => {
         const globalSync = tsplus_module_2.Rest.rest.bulkOverwriteGlobalApplicationCommands(application.id, {

package/dist/Interactions/gateway.js.map

@@ -1 +1 @@
-{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../src/Interactions/gateway.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAExC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAM7C,MAAM,CAAC,MAAM,GAAG,GAAG,CACjB,EAA4B,EAC5B,QAEwB,EACxB,EAAE,IAAI,GAAG,IAAI,KAAc,EAAE,EAC7B,EAAE;IAEA,MAAM,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,GACzD,gBAAgB,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;mCAE5B,WAAW;QAIjB,MAAM,UAAU,GAAG,gBAAA,IAAI,CAAC,IAAI,CAAC,sCAAsC,CACjE,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,gBAAA,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE,CAC3C,gBAAA,IAAI,CAAC,IAAI,CAAC,qCAAqC,CAC7C,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,gBAAA,OAAO,CAAC,cAAc,CAAC,oBAAoB,EAAE,CAAC,CAAC,EAAE,EAAE,CAC7D,yBAMY,QAAQ,EANpB,oBACO,CAAC,CAAC,EAAE,EAAE,CACT,4CAAqB,CAAC,CAAC,EAAE,EAAE,CACzB,gBAAA,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,EADvD,CAAC,CAEA,EAJL,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAKd,CACkB,CACtB,CAAA;iDAEC,IAAI,CAAC,CAAC,CAAC,uBAA8B,SAAS,EAAvC,uBAAW,UAAU,EAArB,GAAG,CAAmB,CAAkB,CAAC,CAAC,CAAC,GAAG;OAhCrD,wBAAwD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAArE,gBAAA,IAAI,CAAC,IAAI,CAAC,mCAAmC,EAAE,CAAuB;IAiCxE,CAAA"}
+{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../src/Interactions/gateway.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAExC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAM7C,MAAM,CAAC,MAAM,GAAG,GACd,CACE,QAEwB,EACxB,EAAE,IAAI,GAAG,IAAI,KAAc,EAAE,EAC7B,EAAE,CACJ,CAAI,EAA4B,EAAE,EAAE;IAEhC,MAAM,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,GACzD,gBAAgB,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;mCAE5B,WAAW;QAIjB,MAAM,UAAU,GAAG,gBAAA,IAAI,CAAC,IAAI,CAAC,sCAAsC,CACjE,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,gBAAA,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE,CAC3C,gBAAA,IAAI,CAAC,IAAI,CAAC,qCAAqC,CAC7C,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,gBAAA,OAAO,CAAC,cAAc,CAAC,oBAAoB,EAAE,CAAC,CAAC,EAAE,EAAE,CAC7D,yBAMY,QAAQ,EANpB,oBACO,CAAC,CAAC,EAAE,EAAE,CACT,4CAAqB,CAAC,CAAC,EAAE,EAAE,CACzB,gBAAA,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,EADvD,CAAC,CAEA,EAJL,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAKd,CACkB,CACtB,CAAA;iDAEC,IAAI,CAAC,CAAC,CAAC,uBAA8B,SAAS,EAAvC,uBAAW,UAAU,EAArB,GAAG,CAAmB,CAAkB,CAAC,CAAC,CAAC,GAAG;OAhCrD,wBAAwD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAArE,gBAAA,IAAI,CAAC,IAAI,CAAC,mCAAmC,EAAE,CAAuB;IAiCxE,CAAA"}

package/dist/index.d.ts

@@ -5,7 +5,7 @@ export * as DiscordWS from "./DiscordGateway/DiscordWS/index.js";
 export * as Gateway from "./DiscordGateway/index.js";
 export { DiscordREST, LiveDiscordREST, rest } from "./DiscordREST/index.js";
 export * as Ix from "./Interactions/index.js";
-export { run as IxRunGateway } from "./Interactions/gateway.js";
+export { run as runIxGateway } from "./Interactions/gateway.js";
 export * as Log from "./Log/index.js";
 export * as RateLimitStore from "./RateLimitStore/index.js";
 export * as Flags from "./Helpers/flags.js";

package/dist/index.js

@@ -7,7 +7,7 @@ export * as DiscordWS from "./DiscordGateway/DiscordWS/index.js";
 export * as Gateway from "./DiscordGateway/index.js";
 export { DiscordREST, LiveDiscordREST, rest } from "./DiscordREST/index.js";
 export * as Ix from "./Interactions/index.js";
-export { run as IxRunGateway } from "./Interactions/gateway.js";
+export { run as runIxGateway } from "./Interactions/gateway.js";
 export * as Log from "./Log/index.js";
 export * as RateLimitStore from "./RateLimitStore/index.js";
 export * as Flags from "./Helpers/flags.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dfx",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -50,5 +50,5 @@
       "@fp-ts/data": "^0.0.20"
     }
   },
-  "gitHead": "7b4807d4e97e8bdd5a4b6efb7679e81fa60401bf"
+  "gitHead": "138bb3ca8bee27e8fb9b66916ed1b75c2751198b"
 }

package/src/Interactions/gateway.ts

@@ -6,49 +6,50 @@ export interface RunOpts {
   sync?: boolean
 }
 
-export const run = <R, R2, E, E2>(
-  ix: InteractionBuilder<R, E>,
-  catchAll: (
-    e: Http.FetchError | Http.StatusCodeError | Http.JsonParseError | E,
-  ) => Effect<R2, E2, any>,
-  { sync = true }: RunOpts = {},
-) =>
-  Do(($) => {
-    const { GlobalApplicationCommand, GuildApplicationCommand } =
-      splitDefinitions(ix.definitions)
-
-    const application = $(
-      Rest.rest.getCurrentBotApplicationInformation().flatMap((a) => a.json),
-    )
-
-    const globalSync = Rest.rest.bulkOverwriteGlobalApplicationCommands(
-      application.id,
-      {
-        body: JSON.stringify(GlobalApplicationCommand.map((a) => a.command)),
-      },
-    )
-
-    const guildSync = GuildApplicationCommand.length
-      ? Gateway.handleDispatch("GUILD_CREATE", (a) =>
-          Rest.rest.bulkOverwriteGuildApplicationCommands(
-            application.id,
-            a.id,
-            GuildApplicationCommand.map((a) => a.command) as any,
-          ),
-        )
-      : Effect.unit()
-
-    const handle = handlers(ix.definitions)
-
-    const run = Gateway.handleDispatch("INTERACTION_CREATE", (i) =>
-      handle[i.type](i)
-        .tap((r) =>
-          r.match(Effect.unit, (r) =>
-            Rest.rest.createInteractionResponse(i.id, i.token, r),
-          ),
-        )
-        .catchAll(catchAll),
-    )
-
-    $(sync ? run.zipPar(globalSync).zipPar(guildSync) : run)
-  })
+export const run =
+  <R2, E, E2>(
+    catchAll: (
+      e: Http.FetchError | Http.StatusCodeError | Http.JsonParseError | E,
+    ) => Effect<R2, E2, any>,
+    { sync = true }: RunOpts = {},
+  ) =>
+  <R>(ix: InteractionBuilder<R, E>) =>
+    Do(($) => {
+      const { GlobalApplicationCommand, GuildApplicationCommand } =
+        splitDefinitions(ix.definitions)
+
+      const application = $(
+        Rest.rest.getCurrentBotApplicationInformation().flatMap((a) => a.json),
+      )
+
+      const globalSync = Rest.rest.bulkOverwriteGlobalApplicationCommands(
+        application.id,
+        {
+          body: JSON.stringify(GlobalApplicationCommand.map((a) => a.command)),
+        },
+      )
+
+      const guildSync = GuildApplicationCommand.length
+        ? Gateway.handleDispatch("GUILD_CREATE", (a) =>
+            Rest.rest.bulkOverwriteGuildApplicationCommands(
+              application.id,
+              a.id,
+              GuildApplicationCommand.map((a) => a.command) as any,
+            ),
+          )
+        : Effect.unit()
+
+      const handle = handlers(ix.definitions)
+
+      const run = Gateway.handleDispatch("INTERACTION_CREATE", (i) =>
+        handle[i.type](i)
+          .tap((r) =>
+            r.match(Effect.unit, (r) =>
+              Rest.rest.createInteractionResponse(i.id, i.token, r),
+            ),
+          )
+          .catchAll(catchAll),
+      )
+
+      $(sync ? run.zipPar(globalSync).zipPar(guildSync) : run)
+    })

package/src/index.ts

@@ -5,7 +5,7 @@ export * as DiscordWS from "./DiscordGateway/DiscordWS/index.js"
 export * as Gateway from "./DiscordGateway/index.js"
 export { DiscordREST, LiveDiscordREST, rest } from "./DiscordREST/index.js"
 export * as Ix from "./Interactions/index.js"
-export { run as IxRunGateway } from "./Interactions/gateway.js"
+export { run as runIxGateway } from "./Interactions/gateway.js"
 export * as Log from "./Log/index.js"
 export * as RateLimitStore from "./RateLimitStore/index.js"