dfx 0.9.4 → 0.9.7

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/DiscordGateway/WS/index.js

@@ -33,13 +33,13 @@ export class WebSocketCloseError {
 }
 const recv = (ws) => tsplus_module_3.async((emit) => {
     ws.on("message", (message) => {
-        return emit.data(message);
+        emit.data(message);
     });
     ws.on("error", (cause) => {
         emit.fail(new WebSocketError(cause));
     });
     ws.on("close", (code, reason) => {
-        return emit.fail(new WebSocketCloseError(code, reason.toString("utf8")));
+        emit.fail(new WebSocketCloseError(code, reason.toString("utf8")));
     });
 });
 export class WebSocketWriteError {

package/dist/DiscordGateway/WS/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/WS/index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,SAAS,MAAM,eAAe,CAAA;AAErC,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,EAAE,CAAA;AAIjC,MAAM,MAAM,GAAG,CAAC,MAAmB,EAAE,OAAiC,EAAE,EAAE,CACxE,mDACQ,GAAG,IACF,IAAI,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,sBADpB,MAAM,IAEJ,CAAC,EAAE,EAAE,EAAE,CACvB,qBAAY,GAAG,EAAE;IACf,EAAE,CAAC,KAAK,EAAE,CAAA;IACV,EAAE,CAAC,kBAAkB,EAAE,CAAA;AACzB,CAAC,CAAC,CACH,CAAA;AAEH,MAAM,OAAO,cAAc;IAEJ;IADZ,IAAI,GAAG,gBAAgB,CAAA;IAChC,YAAqB,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;CACzC;AAED,MAAM,OAAO,mBAAmB;IAET;IAAuB;IADnC,IAAI,GAAG,qBAAqB,CAAA;IACrC,YAAqB,IAAY,EAAW,MAAc;QAArC,SAAI,GAAJ,IAAI,CAAQ;QAAW,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;CAC/D;AAED,MAAM,IAAI,GAAG,CAAC,EAAa,EAAE,EAAE,CAC7B,sBACE,CAAC,IAAI,EAAE,EAAE;IACP,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;QAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC3B,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QACvB,IAAI,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IACtC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;QAC9B,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAC1E,CAAC,CAAC,CAAA;AACJ,CAAC,CACF,CAAA;AAEH,MAAM,OAAO,mBAAmB;IAET;IADZ,IAAI,GAAG,qBAAqB,CAAA;IACrC,YAAqB,MAAa;QAAb,WAAM,GAAN,MAAM,CAAO;IAAG,CAAC;CACvC;AAED,MAAM,IAAI,GAAG,CAAC,EAAa,EAAE,GAAwC,EAAE,EAAE,qBAE/D,GAAG,0BACF,oBAWA,CAAC,IAAI,EAAE,EAAE,CACZ,sBAA+C,CAAC,MAAM,EAAE,EAAE;IACxD,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;QAC9B,MAAM,CAAC,sBAAa,CAAC,CAAA;KACtB;SAAM;QACL,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;YACpB,MAAM,CACJ,GAAG;gBACD,CAAC,CAAC,qBAAY,IAAI,mBAAmB,CAAC,GAAI,CAAC,CAAC;gBAC5C,CAAC,CAAC,sBAAa,CAClB,CAAA;QACH,CAAC,CAAC,CAAA;KACH;AACH,CAAC,CAAC,EAzBC,oBAUO,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,yBAVxC,oBASA,GAAG,EAAE,CAAC,GAAG,EATT,sBAAiC,CAAC,MAAM,EAAE,EAAE;IACjD,IAAI,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,IAAI,EAAE;QAC3B,MAAM,CAAC,sBAAa,CAAC,CAAA;KACtB;SAAM;QACL,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;YACnB,MAAM,CAAC,sBAAa,CAAC,CAAA;QACvB,CAAC,CAAC,CAAA;KACH;AACH,CAAC,CAAC,CACe,EAC+B,CAgB7C,GA3BW,wBAAe,gBAAA,GAAG,CAAC,GAAG,CAAC,CA4BrC,CAAA;AAEJ,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,GAAgB,EAAE,OAAiC,EAAE,EAAE;IAExE,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,2BAAwC,CAAA;+BAC3D,GAAG;QACT,MAAM,OAAO,GAAG,+BAAsB,gBAAA,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAA;QAEnD,MAAM,MAAM,GAAG,uBAKb,2BACE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,qBAAqB,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CAC3D,uDANK,EAAE,wBACF,UAAU,IACT,sBAAe,UAAU,EAAzB,IAAI,CAAC,EAAE,CAAC,CAAkB,EADZ,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,GADnC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,GAOlC,CAAA;QAED,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;OAbT,wBAAe,gBAAA,GAAG,CAAC,GAAG,CAAC;IAcrC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/WS/index.ts"],"names":[],"mappings":"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"}

package/dist/Interactions/context.d.ts

@@ -1,4 +1,4 @@
-import { Discord, Effect } from "dfx/common";
+import { Discord, Effect, Maybe } from "dfx/common";
 import { InteractionResponse } from "./definitions.js";
 export declare const InteractionContext: import("../common.js").Tag<import("../types.js").Interaction>;
 export declare const ApplicationCommandContext: import("../common.js").Tag<import("../types.js").ApplicationCommandDatum>;
@@ -22,7 +22,7 @@ export declare class ResolvedDataNotFound {
 export declare const getResolved: <A>(name: string, f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => A | undefined) => import("../common.js").Effect<import("../types.js").ApplicationCommandDatum, ResolvedDataNotFound, A>;
 export declare const focusedOptionValue: import("../common.js").Effect<FocusedOptionContext, never, string>;
 export declare const commandOptionsMap: import("../common.js").Effect<import("../types.js").ApplicationCommandDatum, never, Record<string, string | undefined>>;
-export declare const handleSubCommands: <NER extends Record<string, import("../common.js").Effect<any, any, InteractionResponse>>>(commands: NER) => import("../common.js").Effect<import("../types.js").Interaction | import("../types.js").ApplicationCommandDatum | Exclude<[NER[keyof NER]] extends [{
+export declare const handleSubCommands: <NER extends Record<string, import("../common.js").Effect<any, any, import("../common.js").Maybe<InteractionResponse>>>>(commands: NER) => import("../common.js").Effect<import("../types.js").Interaction | import("../types.js").ApplicationCommandDatum | Exclude<[NER[keyof NER]] extends [{
     [EffectTypeId]: {
         _R: (_: never) => infer R;
     };
@@ -30,7 +30,7 @@ export declare const handleSubCommands: <NER extends Record<string, import("../c
     [EffectTypeId]: {
         _E: (_: never) => infer E;
     };
-}] ? E : never, InteractionResponse>;
+}] ? E : never, import("../common.js").Maybe<InteractionResponse>>;
 export declare const getSubCommand: import("../common.js").Effect<SubCommandContext, never, import("../types.js").ApplicationCommandInteractionDataOption>;
 export declare const subCommandOptionsMap: import("../common.js").Effect<SubCommandContext, never, Record<string, string | undefined>>;
 export declare const modalValues: import("../common.js").Effect<import("../types.js").ModalSubmitDatum, never, Record<string, string | undefined>>;

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

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/Interactions/context.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAKtD,eAAO,MAAM,kBAAkB,+DAA6B,CAAA;AAC5D,eAAO,MAAM,yBAAyB,2EAAyC,CAAA;AAC/E,eAAO,MAAM,uBAAuB,yEAAuC,CAAA;AAC3E,eAAO,MAAM,kBAAkB,oEAAkC,CAAA;AAEjE,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC,uCAAuC,CAAA;CACxE;AACD,eAAO,MAAM,oBAAoB,kDAA8B,CAAA;AAE/D,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,uCAAuC,CAAA;CAClE;AACD,eAAO,MAAM,iBAAiB,+CAA2B,CAAA;AAEzD,eAAO,MAAM,UAAU,oIAA4C,CAAA;AAEnE,qBAAa,oBAAoB;IAG7B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,uBAAuB;IAC9C,QAAQ,CAAC,IAAI,EAAE,MAAM;IAHvB,QAAQ,CAAC,IAAI,0BAAyB;gBAE3B,IAAI,EAAE,OAAO,CAAC,uBAAuB,EACrC,IAAI,EAAE,MAAM;CAExB;AAED,eAAO,MAAM,WAAW,YAChB,MAAM,UACJ,QAAQ,SAAS,QAAQ,QAAQ,aAAa,4HAUrD,CAAA;AAEH,eAAO,MAAM,kBAAkB,oEAE9B,CAAA;AAED,eAAO,MAAM,iBAAiB,yHAE7B,CAAA;AAED,eAAO,MAAM,iBAAiB;;gBAOM,KAAK;;;;gBAQe,KAAK;;oCAsB1D,CAAA;AAEH,eAAO,MAAM,aAAa,wHAEzB,CAAA;AAED,eAAO,MAAM,oBAAoB,6FAA0C,CAAA;AAE3E,eAAO,MAAM,WAAW,kHAEvB,CAAA"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/Interactions/context.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAKtD,eAAO,MAAM,kBAAkB,+DAA6B,CAAA;AAC5D,eAAO,MAAM,yBAAyB,2EAAyC,CAAA;AAC/E,eAAO,MAAM,uBAAuB,yEAAuC,CAAA;AAC3E,eAAO,MAAM,kBAAkB,oEAAkC,CAAA;AAEjE,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC,uCAAuC,CAAA;CACxE;AACD,eAAO,MAAM,oBAAoB,kDAA8B,CAAA;AAE/D,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,uCAAuC,CAAA;CAClE;AACD,eAAO,MAAM,iBAAiB,+CAA2B,CAAA;AAEzD,eAAO,MAAM,UAAU,oIAA4C,CAAA;AAEnE,qBAAa,oBAAoB;IAG7B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,uBAAuB;IAC9C,QAAQ,CAAC,IAAI,EAAE,MAAM;IAHvB,QAAQ,CAAC,IAAI,0BAAyB;gBAE3B,IAAI,EAAE,OAAO,CAAC,uBAAuB,EACrC,IAAI,EAAE,MAAM;CAExB;AAED,eAAO,MAAM,WAAW,YAChB,MAAM,UACJ,QAAQ,SAAS,QAAQ,QAAQ,aAAa,4HAUrD,CAAA;AAEH,eAAO,MAAM,kBAAkB,oEAE9B,CAAA;AAED,eAAO,MAAM,iBAAiB,yHAE7B,CAAA;AAED,eAAO,MAAM,iBAAiB;;gBAOM,KAAK;;;;gBAQe,KAAK;;kEAsB1D,CAAA;AAEH,eAAO,MAAM,aAAa,wHAEzB,CAAA;AAED,eAAO,MAAM,oBAAoB,6FAA0C,CAAA;AAE3E,eAAO,MAAM,WAAW,kHAEvB,CAAA"}

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.7",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -27,7 +27,7 @@
     "@fp-ts/data": "^0.0.20",
     "@tim-smart/discord-api-docs-parser": "^0.4.1",
     "@types/ws": "^8.5.3",
-    "lerna": "^4.0.0",
+    "lerna": "^6.1.0",
     "typescript": "https://cdn.jsdelivr.net/npm/@tsplus/installer/compiler/typescript.tgz"
   },
   "dependencies": {
@@ -50,5 +50,5 @@
       "@fp-ts/data": "^0.0.20"
     }
   },
-  "gitHead": "7b4807d4e97e8bdd5a4b6efb7679e81fa60401bf"
+  "gitHead": "077dee8878977e0cd33623858efa4314e668f022"
 }

package/src/DiscordGateway/WS/index.ts

@@ -29,7 +29,7 @@ const recv = (ws: WebSocket) =>
   EffectSource.async<WebSocketError | WebSocketCloseError, WebSocket.RawData>(
     (emit) => {
       ws.on("message", (message) => {
-        return emit.data(message)
+        emit.data(message)
       })
 
       ws.on("error", (cause) => {
@@ -37,7 +37,7 @@ const recv = (ws: WebSocket) =>
       })
 
       ws.on("close", (code, reason) => {
-        return emit.fail(new WebSocketCloseError(code, reason.toString("utf8")))
+        emit.fail(new WebSocketCloseError(code, reason.toString("utf8")))
       })
     },
   )

package/src/Interactions/context.ts

@@ -51,7 +51,7 @@ export const commandOptionsMap = Effect.serviceWith(ApplicationCommandContext)(
 )
 
 export const handleSubCommands = <
-  NER extends Record<string, Effect<any, any, InteractionResponse>>,
+  NER extends Record<string, Effect<any, any, Maybe<InteractionResponse>>>,
 >(
   commands: NER,
 ): Effect<
@@ -68,7 +68,7 @@ export const handleSubCommands = <
   [NER[keyof NER]] extends [{ [EffectTypeId]: { _E: (_: never) => infer E } }]
     ? E
     : never,
-  InteractionResponse
+  Maybe<InteractionResponse>
 > =>
   Effect.struct({
     interaction: Effect.service(InteractionContext),

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"