dfx 0.90.2 → 0.91.0

package/mjs/Interactions/context.mjs

@@ -1,34 +1,23 @@
+import { TypeIdError } from "@effect/platform/Error";
+import * as IxHelpers from "dfx/Helpers/interactions";
+import { InteractionsErrorTypeId } from "dfx/Interactions/error";
 import { GenericTag } from "effect/Context";
+import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
 import * as Arr from "effect/ReadonlyArray";
-import * as Effect from "effect/Effect";
-import * as IxHelpers from "dfx/Helpers/interactions";
 export const Interaction = /*#__PURE__*/GenericTag("dfx/Interactions/Interaction");
 export const ApplicationCommand = /*#__PURE__*/GenericTag("dfx/Interactions/ApplicationCommand");
 export const MessageComponentData = /*#__PURE__*/GenericTag("dfx/Interactions/MessageComponentData");
 export const ModalSubmitData = /*#__PURE__*/GenericTag("dfx/Interactions/ModalSubmitData");
 export const FocusedOptionContext = /*#__PURE__*/GenericTag("dfx/Interactions/FocusedOptionContext");
 export const SubCommandContext = /*#__PURE__*/GenericTag("dfx/Interactions/SubCommandContext");
-export class ResolvedDataNotFound {
-  data;
-  name;
-  _tag = "ResolvedDataNotFound";
-  constructor(data, name) {
-    this.data = data;
-    this.name = name;
-  }
-}
-export const resolvedValues = f => Effect.flatMap(Interaction, ix => Effect.mapError(IxHelpers.resolveValues(f)(ix), () => new ResolvedDataNotFound(ix)));
-export const resolved = (name, f) => Effect.flatMap(Interaction, ix => Effect.mapError(IxHelpers.resolveOptionValue(name, f)(ix), () => new ResolvedDataNotFound(ix, name)));
+export const resolvedValues = f => Effect.flatMap(Interaction, ix => IxHelpers.resolveValues(f)(ix));
+export const resolved = (name, f) => Effect.flatMap(Interaction, ix => IxHelpers.resolveOptionValue(name, f)(ix));
 export const focusedOptionValue = /*#__PURE__*/Effect.map(FocusedOptionContext, _ => _.focusedOption.value ?? "");
-export class SubCommandNotFound {
-  data;
-  _tag = "SubCommandNotFound";
-  constructor(data) {
-    this.data = data;
-  }
-}
-export const handleSubCommands = commands => ApplicationCommand.pipe(Effect.flatMap(data => Effect.mapError(Arr.findFirst(IxHelpers.allSubCommands(data), _ => !!commands[_.name]), () => new SubCommandNotFound(data))), Effect.flatMap(command => Effect.provideService(commands[command.name], SubCommandContext, {
+export class SubCommandNotFound extends TypeIdError(InteractionsErrorTypeId, "SubCommandNotFound") {}
+export const handleSubCommands = commands => ApplicationCommand.pipe(Effect.flatMap(data => Effect.mapError(Arr.findFirst(IxHelpers.allSubCommands(data), _ => !!commands[_.name]), () => new SubCommandNotFound({
+  data
+}))), Effect.flatMap(command => Effect.provideService(commands[command.name], SubCommandContext, {
   command
 })));
 export const currentSubCommand = /*#__PURE__*/Effect.map(SubCommandContext, _ => _.command);
@@ -50,14 +39,5 @@ export const optionValue = name => Effect.flatMap(option(name), _ => Option.matc
 export const optionValueOptional = name => Effect.map(option(name), Option.flatMapNullable(o => o.value));
 export const modalValues = /*#__PURE__*/Effect.map(ModalSubmitData, IxHelpers.componentsMap);
 export const modalValueOption = name => Effect.map(ModalSubmitData, IxHelpers.componentValue(name));
-export class ModalValueNotFound {
-  data;
-  name;
-  _tag = "ModalValueNotFound";
-  constructor(data, name) {
-    this.data = data;
-    this.name = name;
-  }
-}
-export const modalValue = name => Effect.flatMap(ModalSubmitData, data => Effect.mapError(IxHelpers.componentValue(name)(data), () => new ModalValueNotFound(data, name)));
+export const modalValue = name => Effect.flatMap(ModalSubmitData, data => IxHelpers.componentValue(name)(data));
 //# sourceMappingURL=context.mjs.map

package/mjs/Interactions/context.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"context.mjs","names":["GenericTag","Option","Arr","Effect","IxHelpers","Interaction","ApplicationCommand","MessageComponentData","ModalSubmitData","FocusedOptionContext","SubCommandContext","ResolvedDataNotFound","data","name","_tag","constructor","resolvedValues","f","flatMap","ix","mapError","resolveValues","resolved","resolveOptionValue","focusedOptionValue","map","_","focusedOption","value","SubCommandNotFound","handleSubCommands","commands","pipe","findFirst","allSubCommands","command","provideService","currentSubCommand","optionsMap","RequiredOptionNotFound","option","getOption","optionValue","match","flatMapNullable","a","onNone","fail","onSome","succeed","optionValueOptional","o","modalValues","componentsMap","modalValueOption","componentValue","ModalValueNotFound","modalValue"],"sources":["../../src/Interactions/context.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"context.mjs","names":["TypeIdError","IxHelpers","InteractionsErrorTypeId","GenericTag","Effect","Option","Arr","Interaction","ApplicationCommand","MessageComponentData","ModalSubmitData","FocusedOptionContext","SubCommandContext","resolvedValues","f","flatMap","ix","resolveValues","resolved","name","resolveOptionValue","focusedOptionValue","map","_","focusedOption","value","SubCommandNotFound","handleSubCommands","commands","pipe","data","mapError","findFirst","allSubCommands","command","provideService","currentSubCommand","optionsMap","RequiredOptionNotFound","_tag","constructor","option","getOption","optionValue","match","flatMapNullable","a","onNone","fail","onSome","succeed","optionValueOptional","o","modalValues","componentsMap","modalValueOption","componentValue","modalValue"],"sources":["../../src/Interactions/context.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAW,QAAQ,wBAAwB;AACpD,OAAO,KAAKC,SAAS,MAAM,0BAA0B;AACrD,SAASC,uBAAuB,QAAQ,wBAAwB;AAGhE,SAASC,UAAU,QAAQ,gBAAgB;AAC3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AAEvC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,GAAG,MAAM,sBAAsB;AAK3C,OAAO,MAAMC,WAAW,gBAAGJ,UAAU,CACnC,8BAA8B,CAC/B;AAKD,OAAO,MAAMK,kBAAkB,gBAAGL,UAAU,CAG1C,qCAAqC,CAAC;AAKxC,OAAO,MAAMM,oBAAoB,gBAAGN,UAAU,CAG5C,uCAAuC,CAAC;AAK1C,OAAO,MAAMO,eAAe,gBAAGP,UAAU,CAGvC,kCAAkC,CAAC;AAQrC,OAAO,MAAMQ,oBAAoB,gBAAGR,UAAU,CAG5C,uCAAuC,CAAC;AAQ1C,OAAO,MAAMS,iBAAiB,gBAAGT,UAAU,CAGzC,oCAAoC,CAAC;AAEvC,OAAO,MAAMU,cAAc,GACzBC,CAAwE,IAKrEV,MAAM,CAACW,OAAO,CAACR,WAAW,EAAES,EAAE,IAAIf,SAAS,CAACgB,aAAa,CAACH,CAAC,CAAC,CAACE,EAAE,CAAC,CAAC;AAEtE,OAAO,MAAME,QAAQ,GAAGA,CACtBC,IAAY,EACZL,CAAwE,KAExEV,MAAM,CAACW,OAAO,CAACR,WAAW,EAAES,EAAE,IAAIf,SAAS,CAACmB,kBAAkB,CAACD,IAAI,EAAEL,CAAC,CAAC,CAACE,EAAE,CAAC,CAAC;AAE9E,OAAO,MAAMK,kBAAkB,gBAAGjB,MAAM,CAACkB,GAAG,CAC1CX,oBAAoB,EACpBY,CAAC,IAAIA,CAAC,CAACC,aAAa,CAACC,KAAK,IAAI,EAAE,CACjC;AAED,OAAM,MAAOC,kBAAmB,SAAQ1B,WAAW,CACjDE,uBAAuB,EACvB,oBAAoB,CAGpB;AAEF,OAAO,MAAMyB,iBAAiB,GAM5BC,QAAa,IAoBbpB,kBAAkB,CAACqB,IAAI,CACrBzB,MAAM,CAACW,OAAO,CAACe,IAAI,IACjB1B,MAAM,CAAC2B,QAAQ,CACbzB,GAAG,CAAC0B,SAAS,CAAC/B,SAAS,CAACgC,cAAc,CAACH,IAAI,CAAC,EAAEP,CAAC,IAAI,CAAC,CAACK,QAAQ,CAACL,CAAC,CAACJ,IAAI,CAAC,CAAC,EACtE,MAAM,IAAIO,kBAAkB,CAAC;EAAEI;AAAI,CAAE,CAAC,CACvC,CACF,EACD1B,MAAM,CAACW,OAAO,CAACmB,OAAO,IACpB9B,MAAM,CAAC+B,cAAc,CAACP,QAAQ,CAACM,OAAO,CAACf,IAAI,CAAC,EAAEP,iBAAiB,EAAE;EAC/DsB;CACD,CAAC,CACH,CACF;AAEH,OAAO,MAAME,iBAAiB,gBAI1BhC,MAAM,CAACkB,GAAG,CAACV,iBAAiB,EAAEW,CAAC,IAAIA,CAAC,CAACW,OAAO,CAAC;AAEjD,OAAO,MAAMG,UAAU,gBAInBjC,MAAM,CAACkB,GAAG,CAACd,kBAAkB,EAAEP,SAAS,CAACoC,UAAU,CAAC;AAExD,OAAM,MAAOC,sBAAsB;EAGtBR,IAAA;EAGAX,IAAA;EALFoB,IAAI,GAAG,wBAAwB;EACxCC,YACWV,IAE0C,EAC1CX,IAAY;IAHZ,KAAAW,IAAI,GAAJA,IAAI;IAGJ,KAAAX,IAAI,GAAJA,IAAI;EACZ;;AAGL,OAAO,MAAMsB,MAAM,GAAItB,IAAY,IACjCf,MAAM,CAACkB,GAAG,CAACd,kBAAkB,EAAEP,SAAS,CAACyC,SAAS,CAACvB,IAAI,CAAC,CAAC;AAE3D,OAAO,MAAMwB,WAAW,GAAIxB,IAAY,IACtCf,MAAM,CAACW,OAAO,CAAC0B,MAAM,CAACtB,IAAI,CAAC,EAAEI,CAAC,IAC5BlB,MAAM,CAACuC,KAAK,CACVvC,MAAM,CAACwC,eAAe,CAACtB,CAAC,EAAEuB,CAAC,IAAIA,CAAC,CAACrB,KAAK,CAAC,EACvC;EACEsB,MAAM,EAAEA,CAAA,KACN3C,MAAM,CAACW,OAAO,CAACP,kBAAkB,EAAEsB,IAAI,IACrC1B,MAAM,CAAC4C,IAAI,CAAC,IAAIV,sBAAsB,CAACR,IAAI,EAAEX,IAAI,CAAC,CAAC,CACpD;EACH8B,MAAM,EAAE7C,MAAM,CAAC8C;CAChB,CACF,CACF;AAEH,OAAO,MAAMC,mBAAmB,GAAIhC,IAAY,IAC9Cf,MAAM,CAACkB,GAAG,CACRmB,MAAM,CAACtB,IAAI,CAAC,EACZd,MAAM,CAACwC,eAAe,CAACO,CAAC,IAAIA,CAAC,CAAC3B,KAAK,CAAC,CACrC;AAEH,OAAO,MAAM4B,WAAW,gBAAGjD,MAAM,CAACkB,GAAG,CAACZ,eAAe,EAAET,SAAS,CAACqD,aAAa,CAAC;AAE/E,OAAO,MAAMC,gBAAgB,GAAIpC,IAAY,IAC3Cf,MAAM,CAACkB,GAAG,CAACZ,eAAe,EAAET,SAAS,CAACuD,cAAc,CAACrC,IAAI,CAAC,CAAC;AAE7D,OAAO,MAAMsC,UAAU,GACrBtC,IAAY,IAEZf,MAAM,CAACW,OAAO,CAACL,eAAe,EAAEoB,IAAI,IAAI7B,SAAS,CAACuD,cAAc,CAACrC,IAAI,CAAC,CAACW,IAAI,CAAC,CAAC","ignoreList":[]}

package/mjs/Interactions/error.mjs

@@ -0,0 +1,2 @@
+export const InteractionsErrorTypeId = /*#__PURE__*/Symbol.for("dfx/Interactions/InteractionsError");
+//# sourceMappingURL=error.mjs.map

package/mjs/Interactions/error.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"error.mjs","names":["InteractionsErrorTypeId","Symbol","for"],"sources":["../../src/Interactions/error.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,MAAMA,uBAAuB,gBAAGC,MAAM,CAACC,GAAG,CAC/C,oCAAoC,CACrC","ignoreList":[]}

package/mjs/Interactions/webhook.mjs

@@ -8,6 +8,8 @@ import * as Layer from "effect/Layer";
 import { handlers } from "dfx/Interactions/handlers";
 import { Interaction } from "dfx/Interactions/index";
 import * as Verify from "discord-verify";
+import { RefailError } from "@effect/platform/Error";
+import { InteractionsErrorTypeId } from "dfx/Interactions/error";
 export class BadWebhookSignature {
   _tag = "BadWebhookSignature";
 }
@@ -29,20 +31,16 @@ const makeConfig = ({
 export const WebhookConfig = /*#__PURE__*/GenericTag("dfx/Interactions/WebhookConfig");
 export const layer = opts => Layer.succeed(WebhookConfig, makeConfig(opts));
 export const layerConfig = config => Layer.effect(WebhookConfig, Effect.map(config, makeConfig));
-export class WebhookParseError {
-  reason;
-  _tag = "WebhookParseError";
-  constructor(reason) {
-    this.reason = reason;
-  }
-}
+export class WebhookParseError extends RefailError(InteractionsErrorTypeId, "WebhookParseError") {}
 const fromHeadersAndBody = (headers, body) => Effect.tap(WebhookConfig, ({
   algorithm,
   crypto,
   publicKey
 }) => checkSignature(publicKey, headers, body, crypto, algorithm)).pipe(Effect.flatMap(() => Effect.try({
   try: () => JSON.parse(body),
-  catch: reason => new WebhookParseError(reason)
+  catch: error => new WebhookParseError({
+    error
+  })
 })));
 const run = (definitions, handleResponse) => {
   const handler = handlers(definitions, handleResponse);

package/mjs/Interactions/webhook.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"webhook.mjs","names":["Chunk","GenericTag","identity","Option","Secret","Effect","Layer","handlers","Interaction","Verify","BadWebhookSignature","_tag","checkSignature","publicKey","headers","body","crypto","algorithm","all","signature","fromNullable","timestamp","pipe","flatMap","_","promise","verify","filterOrFail","catchAllCause","fail","asUnit","makeConfig","applicationId","value","PlatformAlgorithm","WebhookConfig","layer","opts","succeed","layerConfig","config","effect","map","WebhookParseError","reason","constructor","fromHeadersAndBody","tap","try","JSON","parse","catch","run","definitions","handleResponse","handler","interaction","provideService","type","makeHandler","ix","handle","d","_i","r","error","success","makeSimpleHandler"],"sources":["../../src/Interactions/webhook.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"webhook.mjs","names":["Chunk","GenericTag","identity","Option","Secret","Effect","Layer","handlers","Interaction","Verify","RefailError","InteractionsErrorTypeId","BadWebhookSignature","_tag","checkSignature","publicKey","headers","body","crypto","algorithm","all","signature","fromNullable","timestamp","pipe","flatMap","_","promise","verify","filterOrFail","catchAllCause","fail","asUnit","makeConfig","applicationId","value","PlatformAlgorithm","WebhookConfig","layer","opts","succeed","layerConfig","config","effect","map","WebhookParseError","fromHeadersAndBody","tap","try","JSON","parse","catch","error","run","definitions","handleResponse","handler","interaction","provideService","type","makeHandler","ix","handle","d","_i","r","success","makeSimpleHandler"],"sources":["../../src/Interactions/webhook.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/mjs/index.mjs

@@ -1,5 +1,6 @@
 import * as Cache from "dfx/Cache";
 import * as DiscordConfig from "dfx/DiscordConfig";
+import { DiscordRESTLive } from "dfx/DiscordREST";
 import * as Flags from "dfx/Helpers/flags";
 import * as Intents from "dfx/Helpers/intents";
 import * as IxHelpers from "dfx/Helpers/interactions";
@@ -7,8 +8,11 @@ import * as Members from "dfx/Helpers/members";
 import * as Perms from "dfx/Helpers/permissions";
 import * as UI from "dfx/Helpers/ui";
 import * as Ix from "dfx/Interactions/index";
+import { MemoryRateLimitStoreLive } from "dfx/RateLimit";
 import * as Discord from "dfx/types";
+import * as Layer from "effect/Layer";
 export { DiscordREST, DiscordRESTLive } from "dfx/DiscordREST";
-export { MemoryRateLimitStoreLive, RateLimiterLive, RateLimiter, RateLimitStore } from "dfx/RateLimit";
+export { MemoryRateLimitStoreLive, RateLimitStore, RateLimiter, RateLimiterLive } from "dfx/RateLimit";
 export { Cache, Discord, DiscordConfig, Flags, Intents, Ix, IxHelpers, Members, Perms, UI };
+export const DiscordRESTMemoryLive = /*#__PURE__*/DiscordRESTLive.pipe( /*#__PURE__*/Layer.provide(MemoryRateLimitStoreLive));
 //# sourceMappingURL=index.mjs.map

package/mjs/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":["Cache","DiscordConfig","Flags","Intents","IxHelpers","Members","Perms","UI","Ix","Discord","DiscordREST","DiscordRESTLive","MemoryRateLimitStoreLive","RateLimiterLive","RateLimiter","RateLimitStore"],"sources":["../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,KAAK,MAAM,WAAW;AAClC,OAAO,KAAKC,aAAa,MAAM,mBAAmB;AAClD,OAAO,KAAKC,KAAK,MAAM,mBAAmB;AAC1C,OAAO,KAAKC,OAAO,MAAM,qBAAqB;AAC9C,OAAO,KAAKC,SAAS,MAAM,0BAA0B;AACrD,OAAO,KAAKC,OAAO,MAAM,qBAAqB;AAC9C,OAAO,KAAKC,KAAK,MAAM,yBAAyB;AAChD,OAAO,KAAKC,EAAE,MAAM,gBAAgB;AACpC,OAAO,KAAKC,EAAE,MAAM,wBAAwB;AAC5C,OAAO,KAAKC,OAAO,MAAM,WAAW;AAEpC,SAASC,WAAW,EAAEC,eAAe,QAAQ,iBAAiB;AAE9D,SAEEC,wBAAwB,EACxBC,eAAe,EACfC,WAAW,EACXC,cAAc,QACT,eAAe;AAEtB,SACEf,KAAK,EACLS,OAAO,EACPR,aAAa,EACbC,KAAK,EACLC,OAAO,EACPK,EAAE,EACFJ,SAAS,EACTC,OAAO,EACPC,KAAK,EACLC,EAAE","ignoreList":[]}
+{"version":3,"file":"index.mjs","names":["Cache","DiscordConfig","DiscordRESTLive","Flags","Intents","IxHelpers","Members","Perms","UI","Ix","MemoryRateLimitStoreLive","Discord","Layer","DiscordREST","RateLimitStore","RateLimiter","RateLimiterLive","DiscordRESTMemoryLive","pipe","provide"],"sources":["../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,KAAK,MAAM,WAAW;AAClC,OAAO,KAAKC,aAAa,MAAM,mBAAmB;AAClD,SAASC,eAAe,QAAQ,iBAAiB;AACjD,OAAO,KAAKC,KAAK,MAAM,mBAAmB;AAC1C,OAAO,KAAKC,OAAO,MAAM,qBAAqB;AAC9C,OAAO,KAAKC,SAAS,MAAM,0BAA0B;AACrD,OAAO,KAAKC,OAAO,MAAM,qBAAqB;AAC9C,OAAO,KAAKC,KAAK,MAAM,yBAAyB;AAChD,OAAO,KAAKC,EAAE,MAAM,gBAAgB;AACpC,OAAO,KAAKC,EAAE,MAAM,wBAAwB;AAC5C,SAASC,wBAAwB,QAAQ,eAAe;AACxD,OAAO,KAAKC,OAAO,MAAM,WAAW;AACpC,OAAO,KAAKC,KAAK,MAAM,cAAc;AAErC,SAASC,WAAW,EAAEX,eAAe,QAAQ,iBAAiB;AAE9D,SAEEQ,wBAAwB,EACxBI,cAAc,EACdC,WAAW,EACXC,eAAe,QACV,eAAe;AAEtB,SACEhB,KAAK,EACLW,OAAO,EACPV,aAAa,EACbE,KAAK,EACLC,OAAO,EACPK,EAAE,EACFJ,SAAS,EACTC,OAAO,EACPC,KAAK,EACLC,EAAE;AAGJ,OAAO,MAAMS,qBAAqB,gBAAGf,eAAe,CAACgB,IAAI,eACvDN,KAAK,CAACO,OAAO,CAACT,wBAAwB,CAAC,CACxC","ignoreList":[]}

package/mjs/version.mjs

@@ -1,2 +1,2 @@
-export const LIB_VERSION = "0.90.2";
+export const LIB_VERSION = "0.91.0";
 //# sourceMappingURL=version.mjs.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dfx",
-  "version": "0.90.2",
+  "version": "0.91.0",
   "description": "Effect-TS discord library",
   "license": "MIT",
   "repository": {
@@ -44,6 +44,6 @@
     "utf-8-validate": "^6.0.3",
     "zlib-sync": "^0.1.9"
   },
-  "gitHead": "cc6d6a52e49ceadabeef9cb17065dd55fe842d12",
+  "gitHead": "2707397ecfb7f30c500cd27abbb45f6d3cac4057",
   "main": "./index.js"
 }

package/src/Cache/prelude.ts

@@ -238,7 +238,10 @@ export const roles = <RM, EM, E>(
     return yield* _(
       makeWithParent({
         driver,
-        id: _ => Effect.fail(new CacheMissError("RolesCache/id", _.id)),
+        id: _ =>
+          Effect.fail(
+            new CacheMissError({ cacheName: "RolesCache/id", id: _.id }),
+          ),
         ops: opsWithParent({
           id: (a: Discord.Role) => a.id,
           fromParent: Stream.map(gateway.fromDispatch("GUILD_CREATE"), g => [
@@ -262,7 +265,8 @@ export const roles = <RM, EM, E>(
             g => g.id,
           ),
         }),
-        onMiss: (_, id) => Effect.fail(new CacheMissError("RolesCache", id)),
+        onMiss: (_, id) =>
+          Effect.fail(new CacheMissError({ cacheName: "RolesCache", id })),
         onParentMiss: guildId =>
           rest
             .getGuildRoles(guildId)

package/src/Cache.ts

@@ -1,9 +1,10 @@
+import { TypeIdError } from "@effect/platform/Error"
+import type { CacheDriver, ParentCacheDriver } from "dfx/Cache/driver"
+import * as Effect from "effect/Effect"
 import * as Option from "effect/Option"
 import * as Schedule from "effect/Schedule"
 import type * as Scope from "effect/Scope"
-import * as Effect from "effect/Effect"
 import * as Stream from "effect/Stream"
-import type { CacheDriver, ParentCacheDriver } from "dfx/Cache/driver"
 
 export * from "dfx/Cache/driver"
 export {
@@ -253,10 +254,16 @@ export const make = <EOps, EDriver, EMiss, A>({
     }),
   )
 
-export class CacheMissError {
-  readonly _tag = "CacheMissError"
-  constructor(
-    readonly cacheName: string,
-    readonly id: string,
-  ) {}
+export const CacheErrorTypeId = Symbol.for("dfx/Cache/CacheError")
+
+export class CacheMissError extends TypeIdError(
+  CacheErrorTypeId,
+  "CacheMissError",
+)<{
+  cacheName: string
+  id: string
+}> {
+  get message() {
+    return `Cache miss for "${this.cacheName}" with id: ${this.id}`
+  }
 }

package/src/DiscordREST.ts

@@ -21,13 +21,25 @@ import * as Discord from "dfx/types"
 import { LIB_VERSION } from "dfx/version"
 import type { Scope } from "effect/Scope"
 import * as Effectable from "effect/Effectable"
+import { TypeIdError } from "@effect/platform/Error"
 
-export class DiscordRESTError {
-  readonly _tag = "DiscordRESTError"
-  constructor(
-    readonly error: Http.error.HttpClientError,
-    readonly body?: unknown,
-  ) {}
+export const DiscordRESTErrorTypeId = Symbol.for(
+  "dfx/DiscordREST/DiscordRESTError",
+)
+
+export class DiscordRESTError extends TypeIdError(
+  DiscordRESTErrorTypeId,
+  "DiscordRESTError",
+)<{
+  error: Http.error.HttpClientError
+  body?: unknown
+}> {
+  get message() {
+    const httpMessage = this.error.message
+    return this.body !== undefined
+      ? `${httpMessage}: ${JSON.stringify(this.body)}`
+      : httpMessage
+  }
 }
 
 const make = Effect.gen(function* (_) {
@@ -146,12 +158,12 @@ const make = Effect.gen(function* (_) {
     Http.client.catchAll(error =>
       error.reason === "StatusCode"
         ? error.response.json.pipe(
-            Effect.mapError(_ => new DiscordRESTError(_)),
+            Effect.mapError(_ => new DiscordRESTError({ error })),
             Effect.flatMap(body =>
-              Effect.fail(new DiscordRESTError(error, body)),
+              Effect.fail(new DiscordRESTError({ error, body })),
             ),
           )
-        : Effect.fail(new DiscordRESTError(error)),
+        : Effect.fail(new DiscordRESTError({ error })),
     ),
   )
 
@@ -298,5 +310,4 @@ export const DiscordREST = GenericTag<DiscordREST, DiscordRESTService>(
 )
 export const DiscordRESTLive = Layer.effect(DiscordREST, make).pipe(
   Layer.provide(RateLimiterLive),
-  Layer.provide(Http.client.layer),
 )

package/src/Interactions/context.ts

@@ -1,10 +1,13 @@
+import { TypeIdError } from "@effect/platform/Error"
+import * as IxHelpers from "dfx/Helpers/interactions"
+import { InteractionsErrorTypeId } from "dfx/Interactions/error"
+import type * as Discord from "dfx/types"
+import type { NoSuchElementException } from "effect/Cause"
 import { GenericTag } from "effect/Context"
+import * as Effect from "effect/Effect"
 import type * as HashMap from "effect/HashMap"
 import * as Option from "effect/Option"
 import * as Arr from "effect/ReadonlyArray"
-import * as Effect from "effect/Effect"
-import * as IxHelpers from "dfx/Helpers/interactions"
-import type * as Discord from "dfx/types"
 
 export interface DiscordInteraction {
   readonly _: unique symbol
@@ -59,44 +62,31 @@ export const SubCommandContext = GenericTag<
   SubCommandContext
 >("dfx/Interactions/SubCommandContext")
 
-export class ResolvedDataNotFound {
-  readonly _tag = "ResolvedDataNotFound"
-  constructor(
-    readonly data: Discord.Interaction,
-    readonly name?: string,
-  ) {}
-}
-
 export const resolvedValues = <A>(
   f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => A | undefined,
-): Effect.Effect<ReadonlyArray<A>, ResolvedDataNotFound, DiscordInteraction> =>
-  Effect.flatMap(Interaction, ix =>
-    Effect.mapError(
-      IxHelpers.resolveValues(f)(ix),
-      () => new ResolvedDataNotFound(ix),
-    ),
-  )
+): Effect.Effect<
+  ReadonlyArray<A>,
+  NoSuchElementException,
+  DiscordInteraction
+> => Effect.flatMap(Interaction, ix => IxHelpers.resolveValues(f)(ix))
 
 export const resolved = <A>(
   name: string,
   f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => A | undefined,
-): Effect.Effect<A, ResolvedDataNotFound, DiscordInteraction> =>
-  Effect.flatMap(Interaction, ix =>
-    Effect.mapError(
-      IxHelpers.resolveOptionValue(name, f)(ix),
-      () => new ResolvedDataNotFound(ix, name),
-    ),
-  )
+): Effect.Effect<A, NoSuchElementException, DiscordInteraction> =>
+  Effect.flatMap(Interaction, ix => IxHelpers.resolveOptionValue(name, f)(ix))
 
 export const focusedOptionValue = Effect.map(
   FocusedOptionContext,
   _ => _.focusedOption.value ?? "",
 )
 
-export class SubCommandNotFound {
-  readonly _tag = "SubCommandNotFound"
-  constructor(readonly data: Discord.ApplicationCommandDatum) {}
-}
+export class SubCommandNotFound extends TypeIdError(
+  InteractionsErrorTypeId,
+  "SubCommandNotFound",
+)<{
+  data: Discord.ApplicationCommandDatum
+}> {}
 
 export const handleSubCommands = <
   NER extends Record<
@@ -128,7 +118,7 @@ export const handleSubCommands = <
     Effect.flatMap(data =>
       Effect.mapError(
         Arr.findFirst(IxHelpers.allSubCommands(data), _ => !!commands[_.name]),
-        () => new SubCommandNotFound(data),
+        () => new SubCommandNotFound({ data }),
       ),
     ),
     Effect.flatMap(command =>
@@ -188,18 +178,7 @@ export const modalValues = Effect.map(ModalSubmitData, IxHelpers.componentsMap)
 export const modalValueOption = (name: string) =>
   Effect.map(ModalSubmitData, IxHelpers.componentValue(name))
 
-export class ModalValueNotFound {
-  readonly _tag = "ModalValueNotFound"
-  constructor(
-    readonly data: Discord.ModalSubmitDatum,
-    readonly name: string,
-  ) {}
-}
-
-export const modalValue = (name: string) =>
-  Effect.flatMap(ModalSubmitData, data =>
-    Effect.mapError(
-      IxHelpers.componentValue(name)(data),
-      () => new ModalValueNotFound(data, name),
-    ),
-  )
+export const modalValue = (
+  name: string,
+): Effect.Effect<string, NoSuchElementException, DiscordModalSubmit> =>
+  Effect.flatMap(ModalSubmitData, data => IxHelpers.componentValue(name)(data))

package/src/Interactions/definitions.ts

@@ -6,10 +6,10 @@ import type {
   DiscordInteraction,
   DiscordMessageComponent,
   DiscordModalSubmit,
-  ResolvedDataNotFound,
   SubCommandContext,
 } from "dfx/Interactions/context"
 import type * as Discord from "dfx/types"
+import type { NoSuchElementException } from "effect/Cause"
 
 export type InteractionDefinition<R, E> =
   | GlobalApplicationCommand<R, E>
@@ -143,7 +143,7 @@ export interface CommandHelper<A> {
   resolve: <T>(
     name: AllResolvables<A>["name"],
     f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => T | undefined,
-  ) => Effect.Effect<T, ResolvedDataNotFound, DiscordInteraction>
+  ) => Effect.Effect<T, NoSuchElementException, DiscordInteraction>
 
   option: (
     name: AllCommandOptions<A>["name"],

package/src/Interactions/error.ts

@@ -0,0 +1,3 @@
+export const InteractionsErrorTypeId = Symbol.for(
+  "dfx/Interactions/InteractionsError",
+)

package/src/Interactions/webhook.ts

@@ -18,6 +18,8 @@ import type {
 import { Interaction } from "dfx/Interactions/index"
 import type * as Discord from "dfx/types"
 import * as Verify from "discord-verify"
+import { RefailError } from "@effect/platform/Error"
+import { InteractionsErrorTypeId } from "dfx/Interactions/error"
 
 export class BadWebhookSignature {
   readonly _tag = "BadWebhookSignature"
@@ -88,10 +90,10 @@ export const layerConfig: (
   config: Config.Config<MakeConfigOpts>,
 ) => Layer.effect(WebhookConfig, Effect.map(config, makeConfig))
 
-export class WebhookParseError {
-  readonly _tag = "WebhookParseError"
-  constructor(readonly reason: unknown) {}
-}
+export class WebhookParseError extends RefailError(
+  InteractionsErrorTypeId,
+  "WebhookParseError",
+)<{}> {}
 
 const fromHeadersAndBody = (headers: Headers, body: string) =>
   Effect.tap(WebhookConfig, ({ algorithm, crypto, publicKey }) =>
@@ -100,7 +102,7 @@ const fromHeadersAndBody = (headers: Headers, body: string) =>
     Effect.flatMap(() =>
       Effect.try({
         try: () => JSON.parse(body) as Discord.Interaction,
-        catch: reason => new WebhookParseError(reason),
+        catch: error => new WebhookParseError({ error }),
       }),
     ),
   )

package/src/index.ts

@@ -1,5 +1,6 @@
 import * as Cache from "dfx/Cache"
 import * as DiscordConfig from "dfx/DiscordConfig"
+import { DiscordRESTLive } from "dfx/DiscordREST"
 import * as Flags from "dfx/Helpers/flags"
 import * as Intents from "dfx/Helpers/intents"
 import * as IxHelpers from "dfx/Helpers/interactions"
@@ -7,16 +8,18 @@ import * as Members from "dfx/Helpers/members"
 import * as Perms from "dfx/Helpers/permissions"
 import * as UI from "dfx/Helpers/ui"
 import * as Ix from "dfx/Interactions/index"
+import { MemoryRateLimitStoreLive } from "dfx/RateLimit"
 import * as Discord from "dfx/types"
+import * as Layer from "effect/Layer"
 
 export { DiscordREST, DiscordRESTLive } from "dfx/DiscordREST"
 
 export {
   BucketDetails,
   MemoryRateLimitStoreLive,
-  RateLimiterLive,
-  RateLimiter,
   RateLimitStore,
+  RateLimiter,
+  RateLimiterLive,
 } from "dfx/RateLimit"
 
 export {
@@ -31,3 +34,7 @@ export {
   Perms,
   UI,
 }
+
+export const DiscordRESTMemoryLive = DiscordRESTLive.pipe(
+  Layer.provide(MemoryRateLimitStoreLive),
+)

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "0.90.2";
+export const LIB_VERSION = "0.91.0";

package/version.d.ts

@@ -1,2 +1,2 @@
-export declare const LIB_VERSION = "0.90.2";
+export declare const LIB_VERSION = "0.91.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.90.2";
+const LIB_VERSION = exports.LIB_VERSION = "0.91.0";
 //# sourceMappingURL=version.js.map

package/webhooks.d.ts

@@ -1,4 +1,4 @@
 import * as Layer from "effect/Layer";
 export { BadWebhookSignature, WebhookConfig, WebhookParseError, makeHandler, makeSimpleHandler, layer as webhookLayer, layerConfig as webhookLayerConfig, } from "dfx/Interactions/webhook";
-export declare const DiscordLive: Layer.Layer<import("dfx/RateLimit").RateLimiter | import("dfx/DiscordREST").DiscordREST, never, import("./DiscordConfig").DiscordConfig>;
+export declare const DiscordLive: Layer.Layer<import("dfx/RateLimit").RateLimiter | import("dfx/DiscordREST").DiscordREST, never, import("./DiscordConfig").DiscordConfig | import("@effect/platform/Http/Client").Client.Default>;
 //# sourceMappingURL=webhooks.d.ts.map

package/webhooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhooks.d.ts","sourceRoot":"","sources":["./src/webhooks.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,iBAAiB,EACjB,WAAW,EACX,iBAAiB,EACjB,KAAK,IAAI,YAAY,EACrB,WAAW,IAAI,kBAAkB,GAClC,MAAM,0BAA0B,CAAA;AAEjC,eAAO,MAAM,WAAW,0IAGuB,CAAA"}
+{"version":3,"file":"webhooks.d.ts","sourceRoot":"","sources":["./src/webhooks.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,iBAAiB,EACjB,WAAW,EACX,iBAAiB,EACjB,KAAK,IAAI,YAAY,EACrB,WAAW,IAAI,kBAAkB,GAClC,MAAM,0BAA0B,CAAA;AAEjC,eAAO,MAAM,WAAW,kMAGuB,CAAA"}