dfx 0.86.0 → 0.88.0

package/mjs/Interactions/gateway.mjs

@@ -1,5 +1,5 @@
 import * as Chunk from "effect/Chunk";
-import { Tag } from "effect/Context";
+import { GenericTag } from "effect/Context";
 import * as Duration from "effect/Duration";
 import { pipe } from "effect/Function";
 import * as Effect from "effect/Effect";
@@ -22,12 +22,12 @@ export const run = postHandler => ix => Effect.gen(function* (_) {
   const GuildApplicationCommand = ix.definitions.pipe(Chunk.map(_ => _[0]), Chunk.filter(_ => _._tag === "GuildApplicationCommand"), Chunk.toReadonlyArray);
   const gateway = yield* _(DiscordGateway);
   const rest = yield* _(DiscordREST);
-  const application = yield* _(rest.getCurrentBotApplicationInformation(), Effect.flatMap(a => a.json));
+  const application = yield* _(rest.getCurrentBotApplicationInformation().json);
   const globalSync = rest.bulkOverwriteGlobalApplicationCommands(application.id, {
     body: Http.body.unsafeJson(GlobalApplicationCommand.map(_ => _.command))
-  });
-  const guildSync = GuildApplicationCommand.length ? gateway.handleDispatch("GUILD_CREATE", a => rest.bulkOverwriteGuildApplicationCommands(application.id, a.id, GuildApplicationCommand.map(_ => _.command))) : Effect.never;
-  const handle = handlers(ix.definitions, (i, r) => rest.createInteractionResponse(i.id, i.token, r));
+  }).asUnit;
+  const guildSync = GuildApplicationCommand.length ? gateway.handleDispatch("GUILD_CREATE", a => rest.bulkOverwriteGuildApplicationCommands(application.id, a.id, GuildApplicationCommand.map(_ => _.command)).asUnit) : Effect.never;
+  const handle = handlers(ix.definitions, (i, r) => rest.createInteractionResponse(i.id, i.token, r).pipe(Effect.scoped));
   const run = gateway.handleDispatch("INTERACTION_CREATE", i => Effect.provideService(postHandler(handle[i.type](i)), Interaction, i));
   const sync = yield* _(FiberRef.get(interactionsSync));
   return yield* _(sync ? Effect.forever(Effect.all([run, globalSync, guildSync], {
@@ -47,6 +47,6 @@ const makeRegistry = /*#__PURE__*/Effect.gen(function* (_) {
   package: "dfx",
   service: "InteractionsRegistry"
 }));
-export const InteractionsRegistry = /*#__PURE__*/Tag("dfx/Interactions/InteractionsRegistry");
+export const InteractionsRegistry = /*#__PURE__*/GenericTag("dfx/Interactions/InteractionsRegistry");
 export const InteractionsRegistryLive = /*#__PURE__*/Layer.scoped(InteractionsRegistry, makeRegistry);
 //# sourceMappingURL=gateway.mjs.map

package/mjs/Interactions/gateway.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"gateway.mjs","names":["Chunk","Tag","Duration","pipe","Effect","Layer","Queue","Ref","Http","DiscordGateway","DiscordREST","handlers","builder","Interaction","EffectUtils","Schedule","globalValue","FiberRef","interactionsSync","unsafeMake","setInteractionsSync","enabled","locally","run","postHandler","ix","gen","_","GlobalApplicationCommand","definitions","map","filter","_tag","toReadonlyArray","GuildApplicationCommand","gateway","rest","application","getCurrentBotApplicationInformation","flatMap","a","json","globalSync","bulkOverwriteGlobalApplicationCommands","id","body","unsafeJson","command","guildSync","length","handleDispatch","bulkOverwriteGuildApplicationCommands","never","handle","i","r","createInteractionResponse","token","provideService","type","sync","get","forever","all","concurrency","discard","makeRegistry","ref","make","queue","sliding","register","updateAndGet","concat","offer","foreverSwitch","take","catchAllCause","logError","delay","seconds","tapErrorCause","retry","exponential","union","spaced","forkScoped","annotateLogs","package","service","InteractionsRegistry","InteractionsRegistryLive","scoped"],"sources":["../../src/Interactions/gateway.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,KAAK,MAAM,cAAc;AACrC,SAASC,GAAG,QAAQ,gBAAgB;AACpC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,SAASC,IAAI,QAAQ,iBAAiB;AACtC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,GAAG,MAAM,YAAY;AACjC,OAAO,KAAKC,IAAI,MAAM,6BAA6B;AACnD,SAASC,cAAc,QAAQ,oBAAoB;AAEnD,SAASC,WAAW,QAAQ,iBAAiB;AAM7C,SAASC,QAAQ,QAAQ,2BAA2B;AAKpD,SAASC,OAAO,EAAEC,WAAW,QAAQ,wBAAwB;AAC7D,OAAO,KAAKC,WAAW,MAAM,kBAAkB;AAC/C,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,SAASC,WAAW,QAAQ,oBAAoB;AAChD,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAE3C,OAAO,MAAMC,gBAAgB,gBAA+BF,WAAW,CACrE,uBAAuB,EACvB,MAAMC,QAAQ,CAACE,UAAU,CAAC,IAAI,CAAC,CAChC;AAED,OAAO,MAAMC,mBAAmB,GAAIC,OAAgB,IAClDhB,KAAK,CAACiB,OAAO,CAACJ,gBAAgB,EAAEG,OAAO,CAAC;AAE1C,OAAO,MAAME,GAAG,GAEZC,WAMgC,IAGhCC,EAAgC,IAMhCrB,MAAM,CAACsB,GAAG,CAAC,WAAWC,CAAC;EACrB,MAAMC,wBAAwB,GAAGH,EAAE,CAACI,WAAW,CAAC1B,IAAI,CAClDH,KAAK,CAAC8B,GAAG,CAACH,CAAC,IAAIA,CAAC,CAAC,CAAC,CAAC,CAAC,EACpB3B,KAAK,CAAC+B,MAAM,CACTJ,CAAC,IACAA,CAAC,CAACK,IAAI,KAAK,0BAA0B,CACxC,EACDhC,KAAK,CAACiC,eAAe,CACtB;EACD,MAAMC,uBAAuB,GAAGT,EAAE,CAACI,WAAW,CAAC1B,IAAI,CACjDH,KAAK,CAAC8B,GAAG,CAACH,CAAC,IAAIA,CAAC,CAAC,CAAC,CAAC,CAAC,EACpB3B,KAAK,CAAC+B,MAAM,CACTJ,CAAC,IACAA,CAAC,CAACK,IAAI,KAAK,yBAAyB,CACvC,EACDhC,KAAK,CAACiC,eAAe,CACtB;EAED,MAAME,OAAO,GAAG,OAAOR,CAAC,CAAClB,cAAc,CAAC;EACxC,MAAM2B,IAAI,GAAG,OAAOT,CAAC,CAACjB,WAAW,CAAC;EAElC,MAAM2B,WAAW,GAAG,OAAOV,CAAC,CAC1BS,IAAI,CAACE,mCAAmC,EAAE,EAC1ClC,MAAM,CAACmC,OAAO,CAACC,CAAC,IAAIA,CAAC,CAACC,IAAI,CAAC,CAC5B;EAED,MAAMC,UAAU,GAAGN,IAAI,CAACO,sCAAsC,CAC5DN,WAAW,CAACO,EAAE,EACd;IACEC,IAAI,EAAErC,IAAI,CAACqC,IAAI,CAACC,UAAU,CACxBlB,wBAAwB,CAACE,GAAG,CAACH,CAAC,IAAIA,CAAC,CAACoB,OAAO,CAAC;GAE/C,CACF;EAED,MAAMC,SAAS,GAAGd,uBAAuB,CAACe,MAAM,GAC5Cd,OAAO,CAACe,cAAc,CAAC,cAAc,EAAEV,CAAC,IACtCJ,IAAI,CAACe,qCAAqC,CACxCd,WAAW,CAACO,EAAE,EACdJ,CAAC,CAACI,EAAE,EACJV,uBAAuB,CAACJ,GAAG,CAACH,CAAC,IAAIA,CAAC,CAACoB,OAAO,CAAQ,CACnD,CACF,GACD3C,MAAM,CAACgD,KAAK;EAEhB,MAAMC,MAAM,GAAG1C,QAAQ,CAACc,EAAE,CAACI,WAAW,EAAE,CAACyB,CAAC,EAAEC,CAAC,KAC3CnB,IAAI,CAACoB,yBAAyB,CAACF,CAAC,CAACV,EAAE,EAAEU,CAAC,CAACG,KAAK,EAAEF,CAAC,CAAC,CACjD;EAED,MAAMhC,GAAG,GAAGY,OAAO,CAACe,cAAc,CAAC,oBAAoB,EAAEI,CAAC,IACxDlD,MAAM,CAACsD,cAAc,CAAClC,WAAW,CAAC6B,MAAM,CAACC,CAAC,CAACK,IAAI,CAAC,CAACL,CAAC,CAAC,CAAC,EAAEzC,WAAW,EAAEyC,CAAC,CAAC,CACtE;EAED,MAAMM,IAAI,GAAG,OAAOjC,CAAC,CAACV,QAAQ,CAAC4C,GAAG,CAAC3C,gBAAgB,CAAC,CAAC;EAErD,OAAO,OAAOS,CAAC,CACbiC,IAAI,GACAxD,MAAM,CAAC0D,OAAO,CACZ1D,MAAM,CAAC2D,GAAG,CAAC,CAACxC,GAAG,EAAEmB,UAAU,EAAEM,SAAS,CAAC,EAAE;IACvCgB,WAAW,EAAE,WAAW;IACxBC,OAAO,EAAE;GACV,CAAC,CACH,GACD1C,GAAG,CACR;AACH,CAAC,CAAC;AAEN,MAAM2C,YAAY,gBAAG9D,MAAM,CAACsB,GAAG,CAAC,WAAWC,CAAC;EAC1C,MAAMwC,GAAG,GAAG,OAAOxC,CAAC,CAClBpB,GAAG,CAAC6D,IAAI,CAACxD,OAAkD,CAAC,CAC7D;EACD,MAAMyD,KAAK,GAAG,OAAO1C,CAAC,CACpBrB,KAAK,CAACgE,OAAO,CAA0C,CAAC,CAAC,CAC1D;EAED,MAAMC,QAAQ,GAAO9C,EAAuC,IAC1DrB,MAAM,CAACmC,OAAO,CACZhC,GAAG,CAACiE,YAAY,CAACL,GAAG,EAAExC,CAAC,IAAIA,CAAC,CAAC8C,MAAM,CAAChD,EAAS,CAAC,CAAC,EAC/CE,CAAC,IAAIrB,KAAK,CAACoE,KAAK,CAACL,KAAK,EAAE1C,CAAC,CAAC,CAC3B;EAEH,OAAOA,CAAC,CACNb,WAAW,CAAC6D,aAAa,CAACrE,KAAK,CAACsE,IAAI,CAACP,KAAK,CAAC,EAAE5C,EAAE,IAC7CtB,IAAI,CACFsB,EAAE,EACFF,GAAG,CAACnB,MAAM,CAACyE,aAAa,CAAClD,CAAC,IAAIvB,MAAM,CAAC0E,QAAQ,CAAC,iBAAiB,EAAEnD,CAAC,CAAC,CAAC,CAAC,EACrEvB,MAAM,CAAC2E,KAAK,CAAC7E,QAAQ,CAAC8E,OAAO,CAAC,GAAG,CAAC,CAAC,CACpC,CACF,EACD5E,MAAM,CAAC6E,aAAa,CAACtD,CAAC,IAAIvB,MAAM,CAAC0E,QAAQ,CAAC,gBAAgB,EAAEnD,CAAC,CAAC,CAAC,EAC/DvB,MAAM,CAAC8E,KAAK,CACVnE,QAAQ,CAACoE,WAAW,CAAC,WAAW,CAAC,CAAChF,IAAI,CACpCY,QAAQ,CAACqE,KAAK,CAACrE,QAAQ,CAACsE,MAAM,CAAC,YAAY,CAAC,CAAC,CAC9C,CACF,EACDjF,MAAM,CAACkF,UAAU,CAClB;EAED,OAAO;IAAEf;EAAQ,CAAW;AAC9B,CAAC,CAAC,CAACpE,IAAI,eACLC,MAAM,CAACmF,YAAY,CAAC;EAClBC,OAAO,EAAE,KAAK;EACdC,OAAO,EAAE;CACV,CAAC,CACH;AAWD,OAAO,MAAMC,oBAAoB,gBAAGzF,GAAG,CAGrC,uCAAuC,CAAC;AAC1C,OAAO,MAAM0F,wBAAwB,gBAAGtF,KAAK,CAACuF,MAAM,CAClDF,oBAAoB,EACpBxB,YAAY,CACb"}
+{"version":3,"file":"gateway.mjs","names":["Chunk","GenericTag","Duration","pipe","Effect","Layer","Queue","Ref","Http","DiscordGateway","DiscordREST","handlers","builder","Interaction","EffectUtils","Schedule","globalValue","FiberRef","interactionsSync","unsafeMake","setInteractionsSync","enabled","locally","run","postHandler","ix","gen","_","GlobalApplicationCommand","definitions","map","filter","_tag","toReadonlyArray","GuildApplicationCommand","gateway","rest","application","getCurrentBotApplicationInformation","json","globalSync","bulkOverwriteGlobalApplicationCommands","id","body","unsafeJson","command","asUnit","guildSync","length","handleDispatch","a","bulkOverwriteGuildApplicationCommands","never","handle","i","r","createInteractionResponse","token","scoped","provideService","type","sync","get","forever","all","concurrency","discard","makeRegistry","ref","make","queue","sliding","register","flatMap","updateAndGet","concat","offer","foreverSwitch","take","catchAllCause","logError","delay","seconds","tapErrorCause","retry","exponential","union","spaced","forkScoped","annotateLogs","package","service","InteractionsRegistry","InteractionsRegistryLive"],"sources":["../../src/Interactions/gateway.ts"],"sourcesContent":[null],"mappings":"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"}

package/mjs/Interactions/utils.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"utils.mjs","names":["Chunk","Effect","Ctx","context","resolve","resolved","option","optionValue","optionValueOptional","subCommands","handleSubCommands","flattenDefinitions","definitions","handleResponse","map","definition","transform","handle","i","isEffect","flatMap","_","splitDefinitions","grouped","reduce","Autocomplete","empty","GlobalApplicationCommand","GuildApplicationCommand","MessageComponent","ModalSubmit","acc","d","_tag","append","Commands","appendAll","pipe","command","name"],"sources":["../../src/Interactions/utils.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,GAAG,MAAM,0BAA0B;AAoB/C,MAAMC,OAAO,GAAyB;EACpCC,OAAO,EAAEF,GAAG,CAACG,QAAQ;EACrBC,MAAM,EAAEJ,GAAG,CAACI,MAAM;EAClBC,WAAW,EAAEL,GAAG,CAACK,WAAW;EAC5BC,mBAAmB,EAAEN,GAAG,CAACM,mBAAmB;EAC5CC,WAAW,EAAEP,GAAG,CAACQ;CACX;AAER,OAAO,MAAMC,kBAAkB,GAAGA,CAChCC,WAKC,EACDC,cAG2B,KAE3Bb,KAAK,CAACc,GAAG,CAACF,WAAW,EAAE,CAAC,CAACG,UAAU,EAAEC,SAAS,CAAC,MAAM;EACnD,GAAGD,UAAU;EACbE,MAAM,EAAGC,CAAsB,IAC7BjB,MAAM,CAACkB,QAAQ,CAACJ,UAAU,CAACE,MAAM,CAAC,GAC9BD,SAAS,CACPf,MAAM,CAACmB,OAAO,CAACL,UAAU,CAACE,MAAM,EAAEI,CAAC,IAAIR,cAAc,CAACK,CAAC,EAAEG,CAAC,CAAC,CAAC,CAC7D,GACDL,SAAS,CACPf,MAAM,CAACmB,OAAO,CAACL,UAAU,CAACE,MAAM,CAACd,OAAO,CAAC,EAAEkB,CAAC,IAC1CR,cAAc,CAACK,CAAC,EAAEG,CAAC,CAAC,CACrB;CAEV,CAAC,CAAC;AAEL,OAAO,MAAMC,gBAAgB,GAC3BV,WAA0D,IACxD;EACF,MAAMW,OAAO,GAAGvB,KAAK,CAACwB,MAAM,CAC1BZ,WAAW,EACX;IACEa,YAAY,EAAEzB,KAAK,CAAC0B,KAAK,EAAE;IAC3BC,wBAAwB,EAAE3B,KAAK,CAAC0B,KAAK,EAAE;IACvCE,uBAAuB,EAAE5B,KAAK,CAAC0B,KAAK,EAAE;IACtCG,gBAAgB,EAAE7B,KAAK,CAAC0B,KAAK,EAAE;IAC/BI,WAAW,EAAE9B,KAAK,CAAC0B,KAAK;GAKzB,EACD,CAACK,GAAG,EAAEC,CAAC,MAAM;IACX,GAAGD,GAAG;IACN,CAACC,CAAC,CAACC,IAAI,GAAGjC,KAAK,CAACkC,MAAM,CAACH,GAAG,CAACC,CAAC,CAACC,IAAI,CAAqB,EAAED,CAAC;GAC1D,CAAC,CACH;EAED,MAAMG,QAAQ,GAAGnC,KAAK,CAACoC,SAAS,CAC9Bb,OAAO,CAACI,wBAAwB,EAChCJ,OAAO,CAACK,uBAAuB,CAChC,CAACS,IAAI,CACJrC,KAAK,CAACwB,MAAM,CACV,EAA6D,EAC7D,CAACO,GAAG,EAAEC,CAAC,MACJ;IACC,GAAGD,GAAG;IACN,CAACC,CAAC,CAACM,OAAO,CAACC,IAAI,GAAGP;GACnB,CAAQ,CACZ,CACF;EAED,OAAO;IACL,GAAGT,OAAO;IACVY;GACD;AACH,CAAC"}
+{"version":3,"file":"utils.mjs","names":["Chunk","Effect","Ctx","context","resolve","resolved","option","optionValue","optionValueOptional","subCommands","handleSubCommands","flattenDefinitions","definitions","handleResponse","map","definition","transform","handle","i","isEffect","flatMap","_","splitDefinitions","grouped","reduce","Autocomplete","empty","GlobalApplicationCommand","GuildApplicationCommand","MessageComponent","ModalSubmit","acc","d","_tag","append","Commands","appendAll","pipe","command","name"],"sources":["../../src/Interactions/utils.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,GAAG,MAAM,0BAA0B;AAkB/C,MAAMC,OAAO,GAAyB;EACpCC,OAAO,EAAEF,GAAG,CAACG,QAAQ;EACrBC,MAAM,EAAEJ,GAAG,CAACI,MAAM;EAClBC,WAAW,EAAEL,GAAG,CAACK,WAAW;EAC5BC,mBAAmB,EAAEN,GAAG,CAACM,mBAAmB;EAC5CC,WAAW,EAAEP,GAAG,CAACQ;CACX;AAER,OAAO,MAAMC,kBAAkB,GAAGA,CAChCC,WAKC,EACDC,cAG2B,KAE3Bb,KAAK,CAACc,GAAG,CAACF,WAAW,EAAE,CAAC,CAACG,UAAU,EAAEC,SAAS,CAAC,MAAM;EACnD,GAAGD,UAAU;EACbE,MAAM,EAAGC,CAAsB,IAC7BjB,MAAM,CAACkB,QAAQ,CAACJ,UAAU,CAACE,MAAM,CAAC,GAC9BD,SAAS,CACPf,MAAM,CAACmB,OAAO,CAACL,UAAU,CAACE,MAAM,EAAEI,CAAC,IAAIR,cAAc,CAACK,CAAC,EAAEG,CAAC,CAAC,CAAC,CAC7D,GACDL,SAAS,CACPf,MAAM,CAACmB,OAAO,CAACL,UAAU,CAACE,MAAM,CAACd,OAAO,CAAC,EAAEkB,CAAC,IAC1CR,cAAc,CAACK,CAAC,EAAEG,CAAC,CAAC,CACrB;CAEV,CAAC,CAAC;AAEL,OAAO,MAAMC,gBAAgB,GAC3BV,WAA0D,IACxD;EACF,MAAMW,OAAO,GAAGvB,KAAK,CAACwB,MAAM,CAC1BZ,WAAW,EACX;IACEa,YAAY,EAAEzB,KAAK,CAAC0B,KAAK,EAAE;IAC3BC,wBAAwB,EAAE3B,KAAK,CAAC0B,KAAK,EAAE;IACvCE,uBAAuB,EAAE5B,KAAK,CAAC0B,KAAK,EAAE;IACtCG,gBAAgB,EAAE7B,KAAK,CAAC0B,KAAK,EAAE;IAC/BI,WAAW,EAAE9B,KAAK,CAAC0B,KAAK;GAKzB,EACD,CAACK,GAAG,EAAEC,CAAC,MAAM;IACX,GAAGD,GAAG;IACN,CAACC,CAAC,CAACC,IAAI,GAAGjC,KAAK,CAACkC,MAAM,CAACH,GAAG,CAACC,CAAC,CAACC,IAAI,CAAqB,EAAED,CAAC;GAC1D,CAAC,CACH;EAED,MAAMG,QAAQ,GAAGnC,KAAK,CAACoC,SAAS,CAC9Bb,OAAO,CAACI,wBAAwB,EAChCJ,OAAO,CAACK,uBAAuB,CAChC,CAACS,IAAI,CACJrC,KAAK,CAACwB,MAAM,CACV,EAA6D,EAC7D,CAACO,GAAG,EAAEC,CAAC,MACJ;IACC,GAAGD,GAAG;IACN,CAACC,CAAC,CAACM,OAAO,CAACC,IAAI,GAAGP;GACnB,CAAQ,CACZ,CACF;EAED,OAAO;IACL,GAAGT,OAAO;IACVY;GACD;AACH,CAAC"}

package/mjs/Interactions/webhook.mjs

@@ -1,5 +1,5 @@
 import * as Chunk from "effect/Chunk";
-import { Tag } from "effect/Context";
+import { GenericTag } from "effect/Context";
 import { identity } from "effect/Function";
 import * as Option from "effect/Option";
 import * as Secret from "effect/Secret";
@@ -26,7 +26,7 @@ const makeConfig = ({
   crypto,
   algorithm: Verify.PlatformAlgorithm[algorithm]
 });
-export const WebhookConfig = /*#__PURE__*/Tag("dfx/Interactions/WebhookConfig");
+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 {

package/mjs/Interactions/webhook.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"webhook.mjs","names":["Chunk","Tag","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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"}
+{"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":"AAAA,OAAO,KAAKA,KAAK,MAAM,cAAc;AACrC,SAASC,UAAU,QAAQ,gBAAgB;AAC3C,SAASC,QAAQ,QAAQ,iBAAiB;AAC1C,OAAO,KAAKC,MAAM,MAAM,eAAe;AAIvC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AAGrC,SAASC,QAAQ,QAAQ,2BAA2B;AAKpD,SAASC,WAAW,QAAQ,wBAAwB;AAEpD,OAAO,KAAKC,MAAM,MAAM,gBAAgB;AAExC,OAAM,MAAOC,mBAAmB;EACrBC,IAAI,GAAG,qBAAqB;;AAKvC,MAAMC,cAAc,GAAGA,CACrBC,SAAiB,EACjBC,OAAgB,EAChBC,IAAY,EACZC,MAAoB,EACpBC,SAAc,KAEdd,MAAM,CAACe,GAAG,CAAC;EACTC,SAAS,EAAEhB,MAAM,CAACiB,YAAY,CAACN,OAAO,CAAC,qBAAqB,CAAC,CAAC;EAC9DO,SAAS,EAAElB,MAAM,CAACiB,YAAY,CAACN,OAAO,CAAC,uBAAuB,CAAC;CAChE,CAAC,CAACQ,IAAI,CACLjB,MAAM,CAACkB,OAAO,CAACC,CAAC,IACdnB,MAAM,CAACoB,OAAO,CAAC,MACbhB,MAAM,CAACiB,MAAM,CACXX,IAAI,EACJS,CAAC,CAACL,SAAmB,EACrBK,CAAC,CAACH,SAAmB,EACrBR,SAAS,EACTG,MAAM,EACNC,SAAS,CACV,CACF,CACF,EACDZ,MAAM,CAACsB,YAAY,CAACzB,QAAQ,EAAE,MAAM,IAAIQ,mBAAmB,EAAE,CAAC,EAC9DL,MAAM,CAACuB,aAAa,CAAC,MAAMvB,MAAM,CAACwB,IAAI,CAAC,IAAInB,mBAAmB,EAAE,CAAC,CAAC,EAClEL,MAAM,CAACyB,MAAM,CACd;AAQH,MAAMC,UAAU,GAAGA,CAAC;EAClBd,SAAS;EACTe,aAAa;EACbhB,MAAM;EACNH;AAAS,CACM,MAAM;EACrBmB,aAAa;EACbnB,SAAS,EAAET,MAAM,CAAC6B,KAAK,CAACpB,SAAS,CAAC;EAClCG,MAAM;EACNC,SAAS,EAAER,MAAM,CAACyB,iBAAiB,CAACjB,SAAS;CAC9C,CAAC;AAKF,OAAO,MAAMkB,aAAa,gBAAGlC,UAAU,CAGrC,gCAAgC,CAAC;AAEnC,OAAO,MAAMmC,KAAK,GAAIC,IAAoB,IACxC/B,KAAK,CAACgC,OAAO,CAACH,aAAa,EAAEJ,UAAU,CAACM,IAAI,CAAC,CAAC;AAEhD,OAAO,MAAME,WAAW,GAGtBC,MAAqC,IAClClC,KAAK,CAACmC,MAAM,CAACN,aAAa,EAAE9B,MAAM,CAACqC,GAAG,CAACF,MAAM,EAAET,UAAU,CAAC,CAAC;AAEhE,OAAM,MAAOY,iBAAiB;EAEPC,MAAA;EADZjC,IAAI,GAAG,mBAAmB;EACnCkC,YAAqBD,MAAe;IAAf,KAAAA,MAAM,GAANA,MAAM;EAAY;;AAGzC,MAAME,kBAAkB,GAAGA,CAAChC,OAAgB,EAAEC,IAAY,KACxDV,MAAM,CAAC0C,GAAG,CAACZ,aAAa,EAAE,CAAC;EAAElB,SAAS;EAAED,MAAM;EAAEH;AAAS,CAAE,KACzDD,cAAc,CAACC,SAAS,EAAEC,OAAO,EAAEC,IAAI,EAAEC,MAAM,EAAEC,SAAS,CAAC,CAC5D,CAACK,IAAI,CACJjB,MAAM,CAACkB,OAAO,CAAC,MACblB,MAAM,CAAC2C,GAAG,CAAC;EACTA,GAAG,EAAEA,CAAA,KAAMC,IAAI,CAACC,KAAK,CAACnC,IAAI,CAAwB;EAClDoC,KAAK,EAAEP,MAAM,IAAI,IAAID,iBAAiB,CAACC,MAAM;CAC9C,CAAC,CACH,CACF;AAEH,MAAMQ,GAAG,GAAGA,CACVC,WAOC,EACDC,cAGqD,KACnD;EACF,MAAMC,OAAO,GAAGhD,QAAQ,CAAC8C,WAAW,EAAEC,cAAc,CAAC;EACrD,OAAO,CACLxC,OAAgB,EAChBC,IAAY,KAMZV,MAAM,CAACkB,OAAO,CAACuB,kBAAkB,CAAChC,OAAO,EAAEC,IAAI,CAAC,EAAEyC,WAAW,IAC3DnD,MAAM,CAACoD,cAAc,CACnBF,OAAO,CAACC,WAAW,CAACE,IAAI,CAAC,CAACF,WAAW,CAAC,EACtChD,WAAW,EACXgD,WAAW,CACZ,CACF;AACL,CAAC;AASD;;;AAGA,OAAO,MAAMG,WAAW,GACtBC,EAAgC,IAQiB;EACjD,MAAMC,MAAM,GAAGT,GAAG,CAChBpD,KAAK,CAAC0C,GAAG,CAACkB,EAAE,CAACP,WAAW,EAAE,CAAC,CAACS,CAAC,CAAC,KAAK,CAACA,CAAC,EAAE5D,QAAQ,CAAQ,CAAC,EACxD,CAAC6D,EAAE,EAAEC,CAAC,KAAK3D,MAAM,CAACiC,OAAO,CAAC0B,CAAC,CAAC,CAC7B;EAED,OAAO,CAAC;IACNjD,IAAI;IACJkD,KAAK;IACLnD,OAAO;IACPoD;EAAO,CAGR,KACCL,MAAM,CAAC/C,OAAO,EAAEC,IAAI,CAAC,CAACO,IAAI,CACxBjB,MAAM,CAACkB,OAAO,CAAC2C,OAAO,CAAC,EACvB7D,MAAM,CAACuB,aAAa,CAACqC,KAAK,CAAC,CAC5B;AACL,CAAC;AAED;;;AAGA,OAAO,MAAME,iBAAiB,GAC5BP,EAAgC,IAW7B;EACH,MAAMC,MAAM,GAAGT,GAAG,CAChBpD,KAAK,CAAC0C,GAAG,CAACkB,EAAE,CAACP,WAAW,EAAE,CAAC,CAACS,CAAC,CAAC,KAAK,CAACA,CAAC,EAAE5D,QAAQ,CAAQ,CAAC,EACxD,CAAC6D,EAAE,EAAEC,CAAC,KAAK3D,MAAM,CAACiC,OAAO,CAAC0B,CAAC,CAAC,CAC7B;EAED,OAAO,CAAC;IAAEjD,IAAI;IAAED;EAAO,CAAsC,KAC3D+C,MAAM,CAAC/C,OAAO,EAAEC,IAAI,CAAC;AACzB,CAAC"}

package/mjs/RateLimit.mjs

@@ -1,10 +1,10 @@
-import { Tag } from "effect/Context";
+import { GenericTag } from "effect/Context";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Memory from "dfx/RateLimit/memory";
 import { delayFrom } from "dfx/RateLimit/utils";
-export const RateLimitStore = /*#__PURE__*/Tag("dfx/RateLimit/RateLimitStore");
+export const RateLimitStore = /*#__PURE__*/GenericTag("dfx/RateLimit/RateLimitStore");
 export const MemoryRateLimitStoreLive = /*#__PURE__*/Layer.sync(RateLimitStore, Memory.make);
 const makeLimiter = /*#__PURE__*/Effect.gen(function* (_) {
   const store = yield* _(RateLimitStore);
@@ -23,6 +23,6 @@ const makeLimiter = /*#__PURE__*/Effect.gen(function* (_) {
     maybeWait
   };
 });
-export const RateLimiter = /*#__PURE__*/Tag("dfx/RateLimit/RateLimiter");
+export const RateLimiter = /*#__PURE__*/GenericTag("dfx/RateLimit/RateLimiter");
 export const RateLimiterLive = /*#__PURE__*/Layer.effect(RateLimiter, makeLimiter);
 //# sourceMappingURL=RateLimit.mjs.map

package/mjs/RateLimit.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"RateLimit.mjs","names":["Tag","Duration","Effect","Layer","Memory","delayFrom","RateLimitStore","MemoryRateLimitStoreLive","sync","make","makeLimiter","gen","_","store","maybeWait","key","window","limit","multiplier","windowMs","toMillis","incrementCounter","pipe","map","count","ttl","tap","d","annotateLogs","logTrace","service","delay","unit","sleep","asUnit","RateLimiter","RateLimiterLive","effect"],"sources":["../src/RateLimit.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,GAAG,QAAQ,gBAAgB;AACpC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAE3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,MAAM,MAAM,sBAAsB;AAC9C,SAASC,SAAS,QAAQ,qBAAqB;AAuC/C,OAAO,MAAMC,cAAc,gBAAGN,GAAG,CAC/B,8BAA8B,CAC/B;AACD,OAAO,MAAMO,wBAAwB,gBAAGJ,KAAK,CAACK,IAAI,CAACF,cAAc,EAAEF,MAAM,CAACK,IAAI,CAAC;AAE/E,MAAMC,WAAW,gBAAGR,MAAM,CAACS,GAAG,CAAC,WAAWC,CAAC;EACzC,MAAMC,KAAK,GAAG,OAAOD,CAAC,CAACN,cAAc,CAAC;EAEtC,MAAMQ,SAAS,GAAGA,CAChBC,GAAW,EACXC,MAAyB,EACzBC,KAAa,EACbC,UAAU,GAAG,IAAI,KACf;IACF,MAAMC,QAAQ,GAAGlB,QAAQ,CAACmB,QAAQ,CAACJ,MAAM,CAAC,GAAGE,UAAU;IAEvD,OAAOL,KAAK,CAACQ,gBAAgB,CAACN,GAAG,EAAEI,QAAQ,EAAEF,KAAK,CAAC,CAACK,IAAI,CACtDpB,MAAM,CAACqB,GAAG,CAAC,CAAC,CAACC,KAAK,EAAEC,GAAG,CAAC,KAAKpB,SAAS,CAACc,QAAQ,EAAEF,KAAK,EAAEO,KAAK,EAAEC,GAAG,CAAC,CAAC,EACpEvB,MAAM,CAACwB,GAAG,CAACC,CAAC,IACVzB,MAAM,CAAC0B,YAAY,CAAC1B,MAAM,CAAC2B,QAAQ,CAAC,WAAW,CAAC,EAAE;MAChDC,OAAO,EAAE,WAAW;MACpBf,GAAG;MACHC,MAAM,EAAEf,QAAQ,CAACmB,QAAQ,CAACJ,MAAM,CAAC;MACjCG,QAAQ;MACRF,KAAK;MACLc,KAAK,EAAE9B,QAAQ,CAACmB,QAAQ,CAACO,CAAC;KAC3B,CAAC,CACH,EACDzB,MAAM,CAACwB,GAAG,CAACd,CAAC,IACVX,QAAQ,CAACmB,QAAQ,CAACR,CAAC,CAAC,KAAK,CAAC,GAAGV,MAAM,CAAC8B,IAAI,GAAG9B,MAAM,CAAC+B,KAAK,CAACrB,CAAC,CAAC,CAC3D,EACDV,MAAM,CAACgC,MAAM,CACd;EACH,CAAC;EAED,OAAO;IAAEpB;EAAS,CAAE;AACtB,CAAC,CAAC;AAKF,OAAO,MAAMqB,WAAW,gBAAGnC,GAAG,CAG5B,2BAA2B,CAAC;AAC9B,OAAO,MAAMoC,eAAe,gBAAGjC,KAAK,CAACkC,MAAM,CAACF,WAAW,EAAEzB,WAAW,CAAC"}
+{"version":3,"file":"RateLimit.mjs","names":["GenericTag","Duration","Effect","Layer","Memory","delayFrom","RateLimitStore","MemoryRateLimitStoreLive","sync","make","makeLimiter","gen","_","store","maybeWait","key","window","limit","multiplier","windowMs","toMillis","incrementCounter","pipe","map","count","ttl","tap","d","annotateLogs","logTrace","service","delay","unit","sleep","asUnit","RateLimiter","RateLimiterLive","effect"],"sources":["../src/RateLimit.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,UAAU,QAAQ,gBAAgB;AAC3C,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAE3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,MAAM,MAAM,sBAAsB;AAC9C,SAASC,SAAS,QAAQ,qBAAqB;AAuC/C,OAAO,MAAMC,cAAc,gBAAGN,UAAU,CACtC,8BAA8B,CAC/B;AACD,OAAO,MAAMO,wBAAwB,gBAAGJ,KAAK,CAACK,IAAI,CAACF,cAAc,EAAEF,MAAM,CAACK,IAAI,CAAC;AAE/E,MAAMC,WAAW,gBAAGR,MAAM,CAACS,GAAG,CAAC,WAAWC,CAAC;EACzC,MAAMC,KAAK,GAAG,OAAOD,CAAC,CAACN,cAAc,CAAC;EAEtC,MAAMQ,SAAS,GAAGA,CAChBC,GAAW,EACXC,MAAyB,EACzBC,KAAa,EACbC,UAAU,GAAG,IAAI,KACf;IACF,MAAMC,QAAQ,GAAGlB,QAAQ,CAACmB,QAAQ,CAACJ,MAAM,CAAC,GAAGE,UAAU;IAEvD,OAAOL,KAAK,CAACQ,gBAAgB,CAACN,GAAG,EAAEI,QAAQ,EAAEF,KAAK,CAAC,CAACK,IAAI,CACtDpB,MAAM,CAACqB,GAAG,CAAC,CAAC,CAACC,KAAK,EAAEC,GAAG,CAAC,KAAKpB,SAAS,CAACc,QAAQ,EAAEF,KAAK,EAAEO,KAAK,EAAEC,GAAG,CAAC,CAAC,EACpEvB,MAAM,CAACwB,GAAG,CAACC,CAAC,IACVzB,MAAM,CAAC0B,YAAY,CAAC1B,MAAM,CAAC2B,QAAQ,CAAC,WAAW,CAAC,EAAE;MAChDC,OAAO,EAAE,WAAW;MACpBf,GAAG;MACHC,MAAM,EAAEf,QAAQ,CAACmB,QAAQ,CAACJ,MAAM,CAAC;MACjCG,QAAQ;MACRF,KAAK;MACLc,KAAK,EAAE9B,QAAQ,CAACmB,QAAQ,CAACO,CAAC;KAC3B,CAAC,CACH,EACDzB,MAAM,CAACwB,GAAG,CAACd,CAAC,IACVX,QAAQ,CAACmB,QAAQ,CAACR,CAAC,CAAC,KAAK,CAAC,GAAGV,MAAM,CAAC8B,IAAI,GAAG9B,MAAM,CAAC+B,KAAK,CAACrB,CAAC,CAAC,CAC3D,EACDV,MAAM,CAACgC,MAAM,CACd;EACH,CAAC;EAED,OAAO;IAAEpB;EAAS,CAAE;AACtB,CAAC,CAAC;AAKF,OAAO,MAAMqB,WAAW,gBAAGnC,UAAU,CAGnC,2BAA2B,CAAC;AAC9B,OAAO,MAAMoC,eAAe,gBAAGjC,KAAK,CAACkC,MAAM,CAACF,WAAW,EAAEzB,WAAW,CAAC"}

package/mjs/version.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dfx",
-  "version": "0.86.0",
+  "version": "0.88.0",
   "description": "Effect-TS discord library",
   "license": "MIT",
   "repository": {
@@ -39,8 +39,8 @@
     "ws": "^8.16.0"
   },
   "peerDependencies": {
-    "@effect/platform": "^0.42.7",
-    "effect": "^2.2.0"
+    "@effect/platform": "^0.45.0",
+    "effect": "^2.3.0"
   },
   "optionalDependencies": {
     "bufferutil": "^4.0.8",
@@ -48,6 +48,6 @@
     "utf-8-validate": "^6.0.3",
     "zlib-sync": "^0.1.9"
   },
-  "gitHead": "13f8e7d639814ead1de002fcf50230658e2ec071",
+  "gitHead": "6348c07b5a90dc8c855f788b1f3aa47894a432ec",
   "main": "./index.js"
 }

package/src/Cache/driver.ts

@@ -2,42 +2,36 @@ import type * as Option from "effect/Option"
 import type * as Effect from "effect/Effect"
 
 export interface ParentCacheDriver<E, T> {
-  readonly size: Effect.Effect<never, E, number>
-  sizeForParent: (parentId: string) => Effect.Effect<never, E, number>
+  readonly size: Effect.Effect<number, E>
+  sizeForParent: (parentId: string) => Effect.Effect<number, E>
   get: (
     parentId: string,
     resourceId: string,
-  ) => Effect.Effect<never, E, Option.Option<T>>
+  ) => Effect.Effect<Option.Option<T>, E>
   getForParent: (
     parentId: string,
-  ) => Effect.Effect<never, E, Option.Option<ReadonlyMap<string, T>>>
+  ) => Effect.Effect<Option.Option<ReadonlyMap<string, T>>, E>
   set: (
     parentId: string,
     resourceId: string,
     resource: T,
-  ) => Effect.Effect<never, E, void>
-  delete: (
-    parentId: string,
-    resourceId: string,
-  ) => Effect.Effect<never, E, void>
-  parentDelete: (parentId: string) => Effect.Effect<never, E, void>
-  refreshTTL: (
-    parentId: string,
-    resourceId: string,
-  ) => Effect.Effect<never, E, void>
-  readonly run: Effect.Effect<never, E, never>
+  ) => Effect.Effect<void, E>
+  delete: (parentId: string, resourceId: string) => Effect.Effect<void, E>
+  parentDelete: (parentId: string) => Effect.Effect<void, E>
+  refreshTTL: (parentId: string, resourceId: string) => Effect.Effect<void, E>
+  readonly run: Effect.Effect<never, E>
 }
 
 export const createParentDriver = <E, T>(driver: ParentCacheDriver<E, T>) =>
   driver
 
 export interface CacheDriver<E, T> {
-  readonly size: Effect.Effect<never, E, number>
-  get: (resourceId: string) => Effect.Effect<never, E, Option.Option<T>>
-  set: (resourceId: string, resource: T) => Effect.Effect<never, E, void>
-  delete: (resourceId: string) => Effect.Effect<never, E, void>
-  refreshTTL: (resourceId: string) => Effect.Effect<never, E, void>
-  readonly run: Effect.Effect<never, E, never>
+  readonly size: Effect.Effect<number, E>
+  get: (resourceId: string) => Effect.Effect<Option.Option<T>, E>
+  set: (resourceId: string, resource: T) => Effect.Effect<void, E>
+  delete: (resourceId: string) => Effect.Effect<void, E>
+  refreshTTL: (resourceId: string) => Effect.Effect<void, E>
+  readonly run: Effect.Effect<never, E>
 }
 
 export const createDriver = <E, T>(driver: CacheDriver<E, T>) => driver

package/src/Cache/memory.ts

@@ -4,8 +4,6 @@ import type { CacheDriver, ParentCacheDriver } from "dfx/Cache/driver"
 import { createDriver, createParentDriver } from "dfx/Cache/driver"
 
 export const createWithParent = <T>(): Effect.Effect<
-  never,
-  never,
   ParentCacheDriver<never, T>
 > =>
   Effect.sync(() => {
@@ -56,11 +54,7 @@ export const createWithParent = <T>(): Effect.Effect<
     })
   })
 
-export const create = <T>(): Effect.Effect<
-  never,
-  never,
-  CacheDriver<never, T>
-> =>
+export const create = <T>(): Effect.Effect<CacheDriver<never, T>> =>
   Effect.sync(() => {
     const map = new Map<string, T>()
 

package/src/Cache/memoryTTL.ts

@@ -134,12 +134,11 @@ const make = <T>({
 
 export const create = <T>(
   opts: MemoryTTLOpts,
-): Effect.Effect<never, never, CacheDriver<never, T>> =>
-  Effect.sync(() => make<T>(opts))
+): Effect.Effect<CacheDriver<never, T>> => Effect.sync(() => make<T>(opts))
 
 export const createWithParent = <T>(
   opts: MemoryTTLOpts,
-): Effect.Effect<never, never, ParentCacheDriver<never, T>> =>
+): Effect.Effect<ParentCacheDriver<never, T>> =>
   Effect.sync(() => {
     const store = make<T>(opts)
     const parentIds = new Map<string, Set<string>>()
@@ -204,7 +203,7 @@ export const createWithParent = <T>(
           const ids = parentIds.get(parentId)
           parentIds.delete(parentId)
 
-          const effects: Array<Effect.Effect<never, never, void>> = []
+          const effects: Array<Effect.Effect<void>> = []
           if (ids) {
             ids.forEach(id => {
               effects.push(store.delete(id))

package/src/Cache/prelude.ts

@@ -18,15 +18,11 @@ import type * as Discord from "dfx/types"
 
 export interface OptsWithParentOptions<E, A> {
   readonly id: (a: A) => string
-  readonly fromParent: Stream.Stream<
-    never,
-    E,
-    [parentId: string, resources: Array<A>]
-  >
-  readonly create: Stream.Stream<never, E, [parentId: string, resource: A]>
-  readonly update: Stream.Stream<never, E, [parentId: string, resource: A]>
-  readonly remove: Stream.Stream<never, E, [parentId: string, id: string]>
-  readonly parentRemove: Stream.Stream<never, E, string>
+  readonly fromParent: Stream.Stream<[parentId: string, resources: Array<A>], E>
+  readonly create: Stream.Stream<[parentId: string, resource: A], E>
+  readonly update: Stream.Stream<[parentId: string, resource: A], E>
+  readonly remove: Stream.Stream<[parentId: string, id: string], E>
+  readonly parentRemove: Stream.Stream<string, E>
 }
 
 export const opsWithParent = <E, T>({
@@ -36,7 +32,7 @@ export const opsWithParent = <E, T>({
   parentRemove,
   remove,
   update,
-}: OptsWithParentOptions<E, T>): Stream.Stream<never, E, ParentCacheOp<T>> => {
+}: OptsWithParentOptions<E, T>): Stream.Stream<ParentCacheOp<T>, E> => {
   const fromParentOps = Stream.flatMap(fromParent, ([parentId, a]) =>
     Stream.fromIterable(
       a.map(
@@ -96,9 +92,9 @@ export const opsWithParent = <E, T>({
 
 export interface OpsOptions<E, A> {
   id: (a: A) => string
-  create: Stream.Stream<never, E, A>
-  update: Stream.Stream<never, E, A>
-  remove: Stream.Stream<never, E, string>
+  create: Stream.Stream<A, E>
+  update: Stream.Stream<A, E>
+  remove: Stream.Stream<string, E>
 }
 
 export const ops = <E, T>({
@@ -106,7 +102,7 @@ export const ops = <E, T>({
   id,
   remove,
   update,
-}: OpsOptions<E, T>): Stream.Stream<never, E, CacheOp<T>> => {
+}: OpsOptions<E, T>): Stream.Stream<CacheOp<T>, E> => {
   const createOps = Stream.map(
     create,
     (resource): CacheOp<T> => ({
@@ -137,11 +133,11 @@ export const ops = <E, T>({
 }
 
 export const guilds = <RM, EM, E>(
-  makeDriver: Effect.Effect<RM, EM, CacheDriver<E, Discord.Guild>>,
+  makeDriver: Effect.Effect<CacheDriver<E, Discord.Guild>, EM, RM>,
 ): Effect.Effect<
-  RM | DiscordGateway | DiscordREST | Scope.Scope,
+  Cache<E, ResponseError | DiscordRESTError, Discord.Guild>,
   EM,
-  Cache<E, ResponseError | DiscordRESTError, Discord.Guild>
+  RM | DiscordGateway | DiscordREST | Scope.Scope
 > =>
   Effect.gen(function* (_) {
     const driver = yield* _(makeDriver)
@@ -164,22 +160,22 @@ export const guilds = <RM, EM, E>(
           update: gateway.fromDispatch("GUILD_UPDATE"),
           remove: Stream.map(gateway.fromDispatch("GUILD_DELETE"), a => a.id),
         }),
-        onMiss: id => Effect.flatMap(rest.getGuild(id), r => r.json),
+        onMiss: id => rest.getGuild(id).json,
       }),
     )
   })
 
 export const channels = <RM, EM, E>(
-  makeDriver: Effect.Effect<RM, EM, ParentCacheDriver<E, Discord.Channel>>,
+  makeDriver: Effect.Effect<ParentCacheDriver<E, Discord.Channel>, EM, RM>,
 ): Effect.Effect<
-  DiscordGateway | DiscordREST | RM | Scope.Scope,
-  EM,
   ParentCache<
     E,
     ResponseError | DiscordRESTError,
     ResponseError | DiscordRESTError,
     Discord.Channel
-  >
+  >,
+  EM,
+  DiscordGateway | DiscordREST | RM | Scope.Scope
 > =>
   Effect.gen(function* (_) {
     const driver = yield* _(makeDriver)
@@ -213,22 +209,26 @@ export const channels = <RM, EM, E>(
             g => g.id,
           ),
         }),
-        onMiss: (_, id) => Effect.flatMap(rest.getChannel(id), r => r.json),
+        onMiss: (_, id) => rest.getChannel(id).json,
         onParentMiss: guildId =>
-          rest.getGuildChannels(guildId).pipe(
-            Effect.flatMap(r => r.json),
-            Effect.map(a => a.map(a => [a.id, a])),
-          ),
+          rest
+            .getGuildChannels(guildId)
+            .json.pipe(Effect.map(a => a.map(a => [a.id, a]))),
       }),
     )
   })
 
 export const roles = <RM, EM, E>(
-  makeDriver: Effect.Effect<RM, EM, ParentCacheDriver<E, Discord.Role>>,
+  makeDriver: Effect.Effect<ParentCacheDriver<E, Discord.Role>, EM, RM>,
 ): Effect.Effect<
-  DiscordGateway | DiscordREST | RM | Scope.Scope,
+  ParentCache<
+    E,
+    CacheMissError,
+    ResponseError | DiscordRESTError,
+    Discord.Role
+  >,
   EM,
-  ParentCache<E, CacheMissError, ResponseError | DiscordRESTError, Discord.Role>
+  DiscordGateway | DiscordREST | RM | Scope.Scope
 > =>
   Effect.gen(function* (_) {
     const driver = yield* _(makeDriver)
@@ -264,10 +264,9 @@ export const roles = <RM, EM, E>(
         }),
         onMiss: (_, id) => Effect.fail(new CacheMissError("RolesCache", id)),
         onParentMiss: guildId =>
-          rest.getGuildRoles(guildId).pipe(
-            Effect.flatMap(r => r.json),
-            Effect.map(_ => _.map(role => [role.id, role])),
-          ),
+          rest
+            .getGuildRoles(guildId)
+            .json.pipe(Effect.map(_ => _.map(role => [role.id, role]))),
       }),
     )
   })

package/src/Cache.ts

@@ -34,36 +34,36 @@ export interface ParentCache<EDriver, EMiss, EPMiss, A> {
   readonly get: (
     parentId: string,
     id: string,
-  ) => Effect.Effect<never, EDriver | EMiss, A>
-  readonly put: (_: A) => Effect.Effect<never, EDriver | EMiss, void>
+  ) => Effect.Effect<A, EDriver | EMiss>
+  readonly put: (_: A) => Effect.Effect<void, EDriver | EMiss>
   readonly update: <R, E>(
     parentId: string,
     id: string,
-    f: (_: A) => Effect.Effect<R, E, A>,
-  ) => Effect.Effect<R, EDriver | EMiss | E, A>
+    f: (_: A) => Effect.Effect<A, E, R>,
+  ) => Effect.Effect<A, EDriver | EMiss | E, R>
   readonly getForParent: (
     parentId: string,
-  ) => Effect.Effect<never, EDriver | EPMiss, ReadonlyMap<string, A>>
-  readonly size: Effect.Effect<never, EDriver, number>
+  ) => Effect.Effect<ReadonlyMap<string, A>, EDriver | EPMiss>
+  readonly size: Effect.Effect<number, EDriver>
   readonly sizeForParent: (
     parentId: string,
-  ) => Effect.Effect<never, EDriver, number>
+  ) => Effect.Effect<number, EDriver>
   readonly set: (
     parentId: string,
     resourceId: string,
     resource: A,
-  ) => Effect.Effect<never, EDriver, void>
+  ) => Effect.Effect<void, EDriver>
   readonly delete: (
     parentId: string,
     resourceId: string,
-  ) => Effect.Effect<never, EDriver, void>
+  ) => Effect.Effect<void, EDriver>
   readonly parentDelete: (
     parentId: string,
-  ) => Effect.Effect<never, EDriver, void>
+  ) => Effect.Effect<void, EDriver>
   readonly refreshTTL: (
     parentId: string,
     resourceId: string,
-  ) => Effect.Effect<never, EDriver, void>
+  ) => Effect.Effect<void, EDriver>
 }
 
 export const makeWithParent = <EOps, EDriver, EMiss, EPMiss, A>({
@@ -74,19 +74,19 @@ export const makeWithParent = <EOps, EDriver, EMiss, EPMiss, A>({
   ops = Stream.empty,
 }: {
   driver: ParentCacheDriver<EDriver, A>
-  ops?: Stream.Stream<never, EOps, ParentCacheOp<A>>
+  ops?: Stream.Stream<ParentCacheOp<A>, EOps>
   id: (
     _: A,
-  ) => Effect.Effect<never, EMiss, readonly [parentId: string, id: string]>
-  onMiss: (parentId: string, id: string) => Effect.Effect<never, EMiss, A>
+  ) => Effect.Effect<readonly [parentId: string, id: string], EMiss>
+  onMiss: (parentId: string, id: string) => Effect.Effect<A, EMiss>
   onParentMiss: (
     parentId: string,
-  ) => Effect.Effect<never, EPMiss, Array<[id: string, resource: A]>>
-}): Effect.Effect<Scope.Scope, never, ParentCache<EDriver, EMiss, EPMiss, A>> =>
+  ) => Effect.Effect<Array<[id: string, resource: A]>, EPMiss>
+}): Effect.Effect<ParentCache<EDriver, EMiss, EPMiss, A>, never, Scope.Scope> =>
   Effect.gen(function* (_) {
     yield* _(
       Stream.runDrain(
-        Stream.tap(ops, (op): Effect.Effect<never, EDriver, void> => {
+        Stream.tap(ops, (op): Effect.Effect<void, EDriver> => {
           switch (op.op) {
             case "create":
             case "update":
@@ -129,7 +129,7 @@ export const makeWithParent = <EOps, EDriver, EMiss, EPMiss, A>({
     const update = <R, E>(
       parentId: string,
       id: string,
-      f: (_: A) => Effect.Effect<R, E, A>,
+      f: (_: A) => Effect.Effect<A, E, R>,
     ) =>
       get(parentId, id).pipe(
         Effect.flatMap(f),
@@ -171,21 +171,21 @@ export const makeWithParent = <EOps, EDriver, EMiss, EPMiss, A>({
   )
 
 export interface Cache<EDriver, EMiss, A> {
-  readonly get: (id: string) => Effect.Effect<never, EDriver | EMiss, A>
-  readonly put: (_: A) => Effect.Effect<never, EDriver, void>
+  readonly get: (id: string) => Effect.Effect<A, EDriver | EMiss>
+  readonly put: (_: A) => Effect.Effect<void, EDriver>
   readonly update: <R, E>(
     id: string,
-    f: (_: A) => Effect.Effect<R, E, A>,
-  ) => Effect.Effect<R, EDriver | EMiss | E, A>
-  readonly size: Effect.Effect<never, EDriver, number>
+    f: (_: A) => Effect.Effect<A, E, R>,
+  ) => Effect.Effect<A, EDriver | EMiss | E, R>
+  readonly size: Effect.Effect<number, EDriver>
   readonly set: (
     resourceId: string,
     resource: A,
-  ) => Effect.Effect<never, EDriver, void>
-  readonly delete: (resourceId: string) => Effect.Effect<never, EDriver, void>
+  ) => Effect.Effect<void, EDriver>
+  readonly delete: (resourceId: string) => Effect.Effect<void, EDriver>
   readonly refreshTTL: (
     resourceId: string,
-  ) => Effect.Effect<never, EDriver, void>
+  ) => Effect.Effect<void, EDriver>
 }
 
 export const make = <EOps, EDriver, EMiss, A>({
@@ -195,14 +195,14 @@ export const make = <EOps, EDriver, EMiss, A>({
   ops = Stream.empty,
 }: {
   driver: CacheDriver<EDriver, A>
-  ops?: Stream.Stream<never, EOps, CacheOp<A>>
+  ops?: Stream.Stream<CacheOp<A>, EOps>
   id: (_: A) => string
-  onMiss: (id: string) => Effect.Effect<never, EMiss, A>
-}): Effect.Effect<Scope.Scope, never, Cache<EDriver, EMiss, A>> =>
+  onMiss: (id: string) => Effect.Effect<A, EMiss>
+}): Effect.Effect<Cache<EDriver, EMiss, A>, never, Scope.Scope> =>
   Effect.gen(function* (_) {
     yield* _(
       Stream.runDrain(
-        Stream.tap(ops, (op): Effect.Effect<never, EDriver, void> => {
+        Stream.tap(ops, (op): Effect.Effect<void, EDriver> => {
           switch (op.op) {
             case "create":
             case "update":
@@ -238,7 +238,7 @@ export const make = <EOps, EDriver, EMiss, A>({
 
     const put = (_: A) => driver.set(id(_), _)
 
-    const update = <R, E>(id: string, f: (_: A) => Effect.Effect<R, E, A>) =>
+    const update = <R, E>(id: string, f: (_: A) => Effect.Effect<A, E, R>) =>
       get(id).pipe(
         Effect.flatMap(f),
         Effect.tap(_ => driver.set(id, _)),

package/src/DiscordConfig.ts

@@ -1,4 +1,4 @@
-import { Tag } from "effect/Context"
+import { GenericTag } from "effect/Context"
 import * as Duration from "effect/Duration"
 import * as Config from "effect/Config"
 import type * as ConfigError from "effect/ConfigError"
@@ -30,7 +30,7 @@ export interface DiscordConfigService {
     readonly identifyRateLimit: readonly [window: number, limit: number]
   }
 }
-export const DiscordConfig = Tag<DiscordConfig, DiscordConfigService>(
+export const DiscordConfig = GenericTag<DiscordConfig, DiscordConfigService>(
   "dfx/DiscordConfig",
 )
 
@@ -64,10 +64,10 @@ export const make = ({
 
 export const layer = (
   opts: MakeOpts,
-): Layer.Layer<never, never, DiscordConfig> =>
+): Layer.Layer<DiscordConfig> =>
   Layer.succeed(DiscordConfig, make(opts))
 
 export const layerConfig = (
   _: Config.Config.Wrap<MakeOpts>,
-): Layer.Layer<never, ConfigError.ConfigError, DiscordConfig> =>
+): Layer.Layer<DiscordConfig, ConfigError.ConfigError> =>
   Layer.effect(DiscordConfig, Effect.map(Config.unwrap(_), make))