dfx 0.110.2 → 0.111.0

package/mjs/Interactions/context.mjs

@@ -3,8 +3,6 @@ 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/Array";
 export const Interaction = /*#__PURE__*/GenericTag("dfx/Interactions/Interaction");
 export const ApplicationCommand = /*#__PURE__*/GenericTag("dfx/Interactions/ApplicationCommand");
 export const MessageComponentData = /*#__PURE__*/GenericTag("dfx/Interactions/MessageComponentData");
@@ -15,13 +13,7 @@ export const resolvedValues = f => Effect.flatMap(Interaction, ix => IxHelpers.r
 export const resolved = (name, f) => Effect.flatMap(Interaction, ix => IxHelpers.resolveOptionValue(name, f)(ix));
 export const focusedOptionValue = /*#__PURE__*/Effect.map(FocusedOptionContext, _ => _.value ?? "");
 export class SubCommandNotFound extends /*#__PURE__*/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);
-export const optionsMap = /*#__PURE__*/Effect.map(ApplicationCommand, IxHelpers.optionsMap);
 export class RequiredOptionNotFound {
   data;
   name;
@@ -31,12 +23,6 @@ export class RequiredOptionNotFound {
     this.name = name;
   }
 }
-export const option = name => Effect.map(ApplicationCommand, IxHelpers.getOption(name));
-export const optionValue = name => Effect.flatMap(option(name), _ => Option.match(Option.flatMapNullable(_, a => a.value), {
-  onNone: () => Effect.flatMap(ApplicationCommand, data => Effect.fail(new RequiredOptionNotFound(data, name))),
-  onSome: Effect.succeed
-}));
-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 const modalValue = name => Effect.flatMap(ModalSubmitData, data => IxHelpers.componentValue(name)(data));

package/mjs/Interactions/context.mjs.map

@@ -1 +1 @@
-{"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","_","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":"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","ignoreList":[]}
+{"version":3,"file":"context.mjs","names":["TypeIdError","IxHelpers","InteractionsErrorTypeId","GenericTag","Effect","Interaction","ApplicationCommand","MessageComponentData","ModalSubmitData","FocusedOptionContext","SubCommandContext","resolvedValues","f","flatMap","ix","resolveValues","resolved","name","resolveOptionValue","focusedOptionValue","map","_","value","SubCommandNotFound","currentSubCommand","command","RequiredOptionNotFound","data","_tag","constructor","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;AAQvC,OAAO,MAAMC,WAAW,gBAAGF,UAAU,CACnC,8BAA8B,CAC/B;AAKD,OAAO,MAAMG,kBAAkB,gBAAGH,UAAU,CAG1C,qCAAqC,CAAC;AAKxC,OAAO,MAAMI,oBAAoB,gBAAGJ,UAAU,CAG5C,uCAAuC,CAAC;AAK1C,OAAO,MAAMK,eAAe,gBAAGL,UAAU,CAGvC,kCAAkC,CAAC;AAKrC,OAAO,MAAMM,oBAAoB,gBAAGN,UAAU,CAG5C,uCAAuC,CAAC;AAQ1C,OAAO,MAAMO,iBAAiB,gBAAGP,UAAU,CAGzC,oCAAoC,CAAC;AAEvC,OAAO,MAAMQ,cAAc,GACzBC,CAAwE,IAKrER,MAAM,CAACS,OAAO,CAACR,WAAW,EAAES,EAAE,IAAIb,SAAS,CAACc,aAAa,CAACH,CAAC,CAAC,CAACE,EAAE,CAAC,CAAC;AAEtE,OAAO,MAAME,QAAQ,GAAGA,CACtBC,IAAY,EACZL,CAAwE,KAExER,MAAM,CAACS,OAAO,CAACR,WAAW,EAAES,EAAE,IAAIb,SAAS,CAACiB,kBAAkB,CAACD,IAAI,EAAEL,CAAC,CAAC,CAACE,EAAE,CAAC,CAAC;AAE9E,OAAO,MAAMK,kBAAkB,gBAAGf,MAAM,CAACgB,GAAG,CAC1CX,oBAAoB,EACpBY,CAAC,IAAIA,CAAC,CAACC,KAAK,IAAI,EAAE,CACnB;AAED,OAAM,MAAOC,kBAAmB,sBAAQvB,WAAW,CACjDE,uBAAuB,EACvB,oBAAoB,CAGpB;AAEF,OAAO,MAAMsB,iBAAiB,gBAI1BpB,MAAM,CAACgB,GAAG,CAACV,iBAAiB,EAAEW,CAAC,IAAIA,CAAC,CAACI,OAAO,CAAC;AAEjD,OAAM,MAAOC,sBAAsB;EAGtBC,IAAA;EAGAV,IAAA;EALFW,IAAI,GAAG,wBAAwB;EACxCC,YACWF,IAE0C,EAC1CV,IAAY;IAHZ,KAAAU,IAAI,GAAJA,IAAI;IAGJ,KAAAV,IAAI,GAAJA,IAAI;EACZ;;AAGL,OAAO,MAAMa,WAAW,gBAAG1B,MAAM,CAACgB,GAAG,CAACZ,eAAe,EAAEP,SAAS,CAAC8B,aAAa,CAAC;AAE/E,OAAO,MAAMC,gBAAgB,GAAIf,IAAY,IAC3Cb,MAAM,CAACgB,GAAG,CAACZ,eAAe,EAAEP,SAAS,CAACgC,cAAc,CAAChB,IAAI,CAAC,CAAC;AAE7D,OAAO,MAAMiB,UAAU,GACrBjB,IAAY,IAEZb,MAAM,CAACS,OAAO,CAACL,eAAe,EAAEmB,IAAI,IAAI1B,SAAS,CAACgC,cAAc,CAAChB,IAAI,CAAC,CAACU,IAAI,CAAC,CAAC","ignoreList":[]}

package/mjs/Interactions/definitions.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.mjs","names":["GlobalApplicationCommand","command","handle","_tag","constructor","global","GuildApplicationCommand","guild","MessageComponent","predicate","messageComponent","pred","ModalSubmit","modalSubmit","Autocomplete","autocomplete"],"sources":["../../src/Interactions/definitions.ts"],"sourcesContent":[null],"mappings":"AAqBA,OAAM,MAAOA,wBAAwB;EAGxBC,OAAA;EACAC,MAAA;EAHFC,IAAI,GAAG,0BAA0B;EAC1CC,YACWH,OAAqD,EACrDC,MAA4B;IAD5B,KAAAD,OAAO,GAAPA,OAAO;IACP,KAAAC,MAAM,GAANA,MAAM;EACd;;AAGL,OAAO,MAAMG,MAAM,GAAGA,CAKpBJ,OAAU,EACVC,MAA+B,KAE/B,IAAIF,wBAAwB,CAG1BC,OAAc,EAAEC,MAAa,CAAC;AAElC,OAAM,MAAOI,uBAAuB;EAGvBL,OAAA;EACAC,MAAA;EAHFC,IAAI,GAAG,yBAAyB;EACzCC,YACWH,OAAoD,EACpDC,MAA4B;IAD5B,KAAAD,OAAO,GAAPA,OAAO;IACP,KAAAC,MAAM,GAANA,MAAM;EACd;;AAGL,OAAO,MAAMK,KAAK,GAAGA,CAKnBN,OAAU,EACVC,MAA+B,KAE/B,IAAII,uBAAuB,CAGzBL,OAAc,EAAEC,MAAa,CAAC;AAElC,OAAM,MAAOM,gBAAgB;EAGhBC,SAAA;EACAP,MAAA;EAHFC,IAAI,GAAG,kBAAkB;EAClCC,YACWK,SAAwC,EACxCP,MAAwD;IADxD,KAAAO,SAAS,GAATA,SAAS;IACT,KAAAP,MAAM,GAANA,MAAM;EACd;;AAGL,OAAO,MAAMQ,gBAAgB,GAAGA,CAC9BC,IAAmC,EACnCT,MAAyD,KAEzD,IAAIM,gBAAgB,CAGlBG,IAAI,EAAET,MAAa,CAAC;AAExB,OAAM,MAAOU,WAAW;EAGXH,SAAA;EACAP,MAAA;EAHFC,IAAI,GAAG,aAAa;EAC7BC,YACWK,SAAwC,EACxCP,MAAwD;IADxD,KAAAO,SAAS,GAATA,SAAS;IACT,KAAAP,MAAM,GAANA,MAAM;EACd;;AAGL,OAAO,MAAMW,WAAW,GAAGA,CACzBF,IAAmC,EACnCT,MAAwD,KAExD,IAAIU,WAAW,CAGbD,IAAI,EAAET,MAAa,CAAC;AAExB,OAAM,MAAOY,YAAY;EAGZL,SAAA;EAIAP,MAAA;EANFC,IAAI,GAAG,cAAc;EAC9BC,YACWK,SAGG,EACHP,MAAwD;IAJxD,KAAAO,SAAS,GAATA,SAAS;IAIT,KAAAP,MAAM,GAANA,MAAM;EACd;;AAGL,OAAO,MAAMa,YAAY,GAAGA,CAC1BJ,IAGY,EACZT,MAAwD,KAExD,IAAIY,YAAY,CASdH,IAAI,EAAET,MAAa,CAAC","ignoreList":[]}
+{"version":3,"file":"definitions.mjs","names":["GlobalApplicationCommand","command","handle","_tag","constructor","global","GuildApplicationCommand","guild","MessageComponent","predicate","messageComponent","pred","ModalSubmit","modalSubmit","Autocomplete","autocomplete"],"sources":["../../src/Interactions/definitions.ts"],"sourcesContent":[null],"mappings":"AAmBA,OAAM,MAAOA,wBAAwB;EAGxBC,OAAA;EACAC,MAAA;EAHFC,IAAI,GAAG,0BAA0B;EAC1CC,YACWH,OAAqD,EACrDC,MAA4B;IAD5B,KAAAD,OAAO,GAAPA,OAAO;IACP,KAAAC,MAAM,GAANA,MAAM;EACd;;AAGL,OAAO,MAAMG,MAAM,GAAGA,CAKpBJ,OAAU,EACVC,MAA+B,KAE/B,IAAIF,wBAAwB,CAG1BC,OAAc,EAAEC,MAAa,CAAC;AAElC,OAAM,MAAOI,uBAAuB;EAGvBL,OAAA;EACAC,MAAA;EAHFC,IAAI,GAAG,yBAAyB;EACzCC,YACWH,OAAoD,EACpDC,MAA4B;IAD5B,KAAAD,OAAO,GAAPA,OAAO;IACP,KAAAC,MAAM,GAANA,MAAM;EACd;;AAGL,OAAO,MAAMK,KAAK,GAAGA,CAKnBN,OAAU,EACVC,MAA+B,KAE/B,IAAII,uBAAuB,CAGzBL,OAAc,EAAEC,MAAa,CAAC;AAElC,OAAM,MAAOM,gBAAgB;EAGhBC,SAAA;EACAP,MAAA;EAHFC,IAAI,GAAG,kBAAkB;EAClCC,YACWK,SAAwC,EACxCP,MAAwD;IADxD,KAAAO,SAAS,GAATA,SAAS;IACT,KAAAP,MAAM,GAANA,MAAM;EACd;;AAGL,OAAO,MAAMQ,gBAAgB,GAAGA,CAC9BC,IAAmC,EACnCT,MAAyD,KAEzD,IAAIM,gBAAgB,CAGlBG,IAAI,EAAET,MAAa,CAAC;AAExB,OAAM,MAAOU,WAAW;EAGXH,SAAA;EACAP,MAAA;EAHFC,IAAI,GAAG,aAAa;EAC7BC,YACWK,SAAwC,EACxCP,MAAwD;IADxD,KAAAO,SAAS,GAATA,SAAS;IACT,KAAAP,MAAM,GAANA,MAAM;EACd;;AAGL,OAAO,MAAMW,WAAW,GAAGA,CACzBF,IAAmC,EACnCT,MAAwD,KAExD,IAAIU,WAAW,CAGbD,IAAI,EAAET,MAAa,CAAC;AAExB,OAAM,MAAOY,YAAY;EAGZL,SAAA;EAIAP,MAAA;EANFC,IAAI,GAAG,cAAc;EAC9BC,YACWK,SAGG,EACHP,MAAwD;IAJxD,KAAAO,SAAS,GAATA,SAAS;IAIT,KAAAP,MAAM,GAANA,MAAM;EACd;;AAGL,OAAO,MAAMa,YAAY,GAAGA,CAC1BJ,IAGY,EACZT,MAAwD,KAExD,IAAIY,YAAY,CASdH,IAAI,EAAET,MAAa,CAAC","ignoreList":[]}

package/mjs/Interactions/utils.mjs

@@ -1,22 +1,10 @@
 import * as Chunk from "effect/Chunk";
 import * as Effect from "effect/Effect";
-import * as Ctx from "dfx/Interactions/context";
-import * as Discord from "dfx/types";
 import * as Array from "effect/Array";
-import * as Helpers from "dfx/Helpers/interactions";
-const context = {
-  resolve: Ctx.resolved,
-  option: Ctx.option,
-  optionValue: Ctx.optionValue,
-  optionValueOptional: Ctx.optionValueOptional,
-  subCommands: Ctx.handleSubCommands
-};
+import { CommandHelper } from "./commandHelper";
 export const flattenDefinitions = (definitions, handleResponse) => Array.map(Chunk.toReadonlyArray(definitions), ([definition, transform]) => ({
   ...definition,
-  handle: Effect.isEffect(definition.handle) ? i => Effect.scoped(transform(Effect.flatMap(definition.handle, _ => handleResponse(i, _)))) : i => Effect.scoped(transform(Effect.flatMap(definition.handle({
-    ...context,
-    target: i.type === Discord.InteractionType.APPLICATION_COMMAND ? Helpers.target(i.data) : undefined
-  }), _ => handleResponse(i, _))))
+  handle: Effect.isEffect(definition.handle) ? i => Effect.scoped(transform(Effect.flatMap(definition.handle, _ => handleResponse(i, _)))) : i => Effect.scoped(transform(Effect.flatMap(definition.handle(new CommandHelper(i)), _ => handleResponse(i, _))))
 }));
 export const splitDefinitions = definitions => {
   const grouped = Array.reduce(definitions, {

package/mjs/Interactions/utils.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"utils.mjs","names":["Chunk","Effect","Ctx","Discord","Array","Helpers","context","resolve","resolved","option","optionValue","optionValueOptional","subCommands","handleSubCommands","flattenDefinitions","definitions","handleResponse","map","toReadonlyArray","definition","transform","handle","isEffect","i","scoped","flatMap","_","target","type","InteractionType","APPLICATION_COMMAND","data","undefined","splitDefinitions","grouped","reduce","Autocomplete","GlobalApplicationCommand","GuildApplicationCommand","MessageComponent","ModalSubmit","Commands","acc","d","_tag","push","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;AAE/C,OAAO,KAAKC,OAAO,MAAM,WAAW;AACpC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,OAAO,MAAM,0BAA0B;AAgBnD,MAAMC,OAAO,GAAyB;EACpCC,OAAO,EAAEL,GAAG,CAACM,QAAQ;EACrBC,MAAM,EAAEP,GAAG,CAACO,MAAM;EAClBC,WAAW,EAAER,GAAG,CAACQ,WAAW;EAC5BC,mBAAmB,EAAET,GAAG,CAACS,mBAAmB;EAC5CC,WAAW,EAAEV,GAAG,CAACW;CACX;AAER,OAAO,MAAMC,kBAAkB,GAAGA,CAChCC,WAKC,EACDC,cAG2B,KAE3BZ,KAAK,CAACa,GAAG,CAACjB,KAAK,CAACkB,eAAe,CAACH,WAAW,CAAC,EAAE,CAAC,CAACI,UAAU,EAAEC,SAAS,CAAC,MAAM;EAC1E,GAAGD,UAAU;EACbE,MAAM,EAAEpB,MAAM,CAACqB,QAAQ,CAACH,UAAU,CAACE,MAAM,CAAC,GACrCE,CAAsB,IACrBtB,MAAM,CAACuB,MAAM,CACXJ,SAAS,CACPnB,MAAM,CAACwB,OAAO,CACZN,UAAU,CAACE,MAAoD,EAC/DK,CAAC,IAAIV,cAAc,CAACO,CAAC,EAAEG,CAAC,CAAC,CAC1B,CACF,CACF,GACFH,CAAsB,IACrBtB,MAAM,CAACuB,MAAM,CACXJ,SAAS,CACPnB,MAAM,CAACwB,OAAO,CAEVN,UAAU,CAACE,MAGZ,CAAC;IACA,GAAGf,OAAO;IACVqB,MAAM,EACJJ,CAAC,CAACK,IAAI,KAAKzB,OAAO,CAAC0B,eAAe,CAACC,mBAAmB,GAClDzB,OAAO,CAACsB,MAAM,CAACJ,CAAC,CAACQ,IAAW,CAAC,GAC7BC;GACP,CAAC,EACFN,CAAC,IAAIV,cAAc,CAACO,CAAC,EAAEG,CAAC,CAAC,CAC1B,CACF;CAEV,CAAC,CAAC;AAEL,OAAO,MAAMO,gBAAgB,GAC3BlB,WAA4D,IAC1D;EACF,MAAMmB,OAAO,GAAG9B,KAAK,CAAC+B,MAAM,CAC1BpB,WAAW,EACX;IACEqB,YAAY,EAAE,EAAE;IAChBC,wBAAwB,EAAE,EAAE;IAC5BC,uBAAuB,EAAE,EAAE;IAC3BC,gBAAgB,EAAE,EAAE;IACpBC,WAAW,EAAE,EAAE;IACfC,QAAQ,EAAE;GAOX,EACD,CAACC,GAAG,EAAEC,CAAC,KAAI;IACTD,GAAG,CAACC,CAAC,CAACC,IAAI,CAAC,CAACC,IAAI,CAACF,CAAQ,CAAC;IAC1B,IACEA,CAAC,CAACC,IAAI,KAAK,0BAA0B,IACrCD,CAAC,CAACC,IAAI,KAAK,yBAAyB,EACpC;MACAF,GAAG,CAACD,QAAQ,CAACE,CAAC,CAACG,OAAO,CAACC,IAAI,CAAC,GAAGJ,CAAQ;IACzC;IACA,OAAOD,GAAG;EACZ,CAAC,CACF;EAED,OAAOR,OAAO;AAChB,CAAC","ignoreList":[]}
+{"version":3,"file":"utils.mjs","names":["Chunk","Effect","Array","CommandHelper","flattenDefinitions","definitions","handleResponse","map","toReadonlyArray","definition","transform","handle","isEffect","i","scoped","flatMap","_","splitDefinitions","grouped","reduce","Autocomplete","GlobalApplicationCommand","GuildApplicationCommand","MessageComponent","ModalSubmit","Commands","acc","d","_tag","push","command","name"],"sources":["../../src/Interactions/utils.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,MAAM,MAAM,eAAe;AAGvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,SAASC,aAAa,QAAQ,iBAAiB;AAgB/C,OAAO,MAAMC,kBAAkB,GAAGA,CAChCC,WAKC,EACDC,cAG2B,KAE3BJ,KAAK,CAACK,GAAG,CAACP,KAAK,CAACQ,eAAe,CAACH,WAAW,CAAC,EAAE,CAAC,CAACI,UAAU,EAAEC,SAAS,CAAC,MAAM;EAC1E,GAAGD,UAAU;EACbE,MAAM,EAAEV,MAAM,CAACW,QAAQ,CAACH,UAAU,CAACE,MAAM,CAAC,GACrCE,CAAsB,IACrBZ,MAAM,CAACa,MAAM,CACXJ,SAAS,CACPT,MAAM,CAACc,OAAO,CACZN,UAAU,CAACE,MAAoD,EAC/DK,CAAC,IAAIV,cAAc,CAACO,CAAC,EAAEG,CAAC,CAAC,CAC1B,CACF,CACF,GACFH,CAAsB,IACrBZ,MAAM,CAACa,MAAM,CACXJ,SAAS,CACPT,MAAM,CAACc,OAAO,CAEVN,UAAU,CAACE,MAGZ,CAAC,IAAIR,aAAa,CAACU,CAAC,CAAC,CAAC,EACvBG,CAAC,IAAIV,cAAc,CAACO,CAAC,EAAEG,CAAC,CAAC,CAC1B,CACF;CAEV,CAAC,CAAC;AAEL,OAAO,MAAMC,gBAAgB,GAC3BZ,WAA4D,IAC1D;EACF,MAAMa,OAAO,GAAGhB,KAAK,CAACiB,MAAM,CAC1Bd,WAAW,EACX;IACEe,YAAY,EAAE,EAAE;IAChBC,wBAAwB,EAAE,EAAE;IAC5BC,uBAAuB,EAAE,EAAE;IAC3BC,gBAAgB,EAAE,EAAE;IACpBC,WAAW,EAAE,EAAE;IACfC,QAAQ,EAAE;GAOX,EACD,CAACC,GAAG,EAAEC,CAAC,KAAI;IACTD,GAAG,CAACC,CAAC,CAACC,IAAI,CAAC,CAACC,IAAI,CAACF,CAAQ,CAAC;IAC1B,IACEA,CAAC,CAACC,IAAI,KAAK,0BAA0B,IACrCD,CAAC,CAACC,IAAI,KAAK,yBAAyB,EACpC;MACAF,GAAG,CAACD,QAAQ,CAACE,CAAC,CAACG,OAAO,CAACC,IAAI,CAAC,GAAGJ,CAAQ;IACzC;IACA,OAAOD,GAAG;EACZ,CAAC,CACF;EAED,OAAOR,OAAO;AAChB,CAAC","ignoreList":[]}

package/mjs/version.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dfx",
-  "version": "0.110.2",
+  "version": "0.111.0",
   "description": "Effect-TS discord library",
   "license": "MIT",
   "repository": {
@@ -41,6 +41,6 @@
   "optionalDependencies": {
     "discord-verify": "^1.2.0"
   },
-  "gitHead": "fdf910c9e1b3ee64908db30da18aec7ba1bf78a7",
+  "gitHead": "e097ca2129cf44e65891f203a1299ed6a24cde31",
   "main": "./index.js"
 }

package/src/Interactions/commandHelper.ts

@@ -0,0 +1,236 @@
+import * as Option from "effect/Option"
+import * as Effect from "effect/Effect"
+import {
+  SubCommandContext,
+  SubCommandNotFound,
+  type DiscordApplicationCommand,
+  type DiscordInteraction,
+} from "dfx/Interactions/context"
+import type * as Discord from "dfx/types"
+import * as Helpers from "dfx/Helpers/interactions"
+import * as Arr from "effect/Array"
+import type { HashMap } from "effect/HashMap"
+
+export class CommandHelper<A> {
+  constructor(readonly interaction: Discord.Interaction) {
+    this.target = Helpers.target(interaction.data as any) as any
+    this.data = interaction.data as any
+  }
+  readonly data: Discord.ApplicationCommandDatum
+  readonly target: CommandTypeMap<
+    A,
+    {
+      [Discord.ApplicationCommandType
+        .CHAT_INPUT]: Discord.ApplicationCommandDatum
+      [Discord.ApplicationCommandType.MESSAGE]: Discord.Message
+      [Discord.ApplicationCommandType.USER]: Discord.User
+      [Discord.ApplicationCommandType.PRIMARY_ENTRY_POINT]: undefined
+    }
+  >
+
+  resolve<T>(
+    name: AllResolvables<A>["name"],
+    f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => T | undefined,
+  ): Option.Option<T> {
+    return Helpers.resolveOptionValue(name, f)(this.interaction)
+  }
+
+  resolvedValues<T>(
+    f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => T | undefined,
+  ): Option.Option<ReadonlyArray<T>> {
+    return Helpers.resolveValues(f)(this.interaction)
+  }
+
+  option(
+    name: AllCommandOptions<A>["name"],
+  ): Option.Option<Discord.ApplicationCommandInteractionDataOption> {
+    return Helpers.getOption(name)(this.data)
+  }
+
+  optionValue<N extends AllRequiredCommandOptions<A>["name"]>(
+    name: N,
+  ): CommandValue<A, N> {
+    return Option.getOrThrow(this.optionValueOptional(name))
+  }
+
+  optionValueOptional<N extends AllCommandOptions<A>["name"]>(
+    name: N,
+  ): Option.Option<CommandValue<A, N>> {
+    return Option.map(this.option(name), _ => _.value) as any
+  }
+
+  optionValueOrElse<N extends AllCommandOptions<A>["name"], const OrElse>(
+    name: N,
+    orElse: () => OrElse,
+  ): Option.Option<CommandValue<A, N>> {
+    return Option.getOrElse(this.option(name), orElse) as any
+  }
+
+  subCommands<
+    NER extends SubCommandNames<A> extends never
+      ? never
+      : Record<
+          SubCommandNames<A>,
+          Effect.Effect<Discord.InteractionResponse, any, any>
+        >,
+  >(
+    commands: NER,
+  ): Effect.Effect<
+    Discord.InteractionResponse,
+    [NER[keyof NER]] extends [
+      { [Effect.EffectTypeId]: { _E: (_: never) => infer E } },
+    ]
+      ? E
+      : never,
+    | Exclude<
+        [NER[keyof NER]] extends [
+          { [Effect.EffectTypeId]: { _R: (_: never) => infer R } },
+        ]
+          ? R
+          : never,
+        SubCommandContext
+      >
+    | DiscordInteraction
+    | DiscordApplicationCommand
+  > {
+    const commands_ = commands as Record<string, any>
+    return Effect.mapError(
+      Arr.findFirst(
+        Helpers.allSubCommands(this.data),
+        _ => !!commands_[_.name],
+      ),
+      () => new SubCommandNotFound({ data: this.data }),
+    ).pipe(
+      Effect.flatMap(command =>
+        Effect.provideService(commands_[command.name], SubCommandContext, {
+          command,
+        }),
+      ),
+    ) as any
+  }
+
+  get optionsMap(): HashMap<string, string | undefined> {
+    return Helpers.optionsMap(this.data)
+  }
+}
+
+export type CommandHandlerFn<R, E, A> = (
+  i: CommandHelper<A>,
+) => Effect.Effect<Discord.InteractionResponse, E, R>
+
+interface CommandOption {
+  readonly type: any
+  readonly name: string
+  readonly options?: ReadonlyArray<CommandOption>
+}
+
+type CommandTypeMap<
+  A,
+  Options extends Record<Discord.ApplicationCommandType, any>,
+> = A extends { readonly type: infer T }
+  ? T extends keyof Options
+    ? Options[T]
+    : never
+  : Options[Discord.ApplicationCommandType.CHAT_INPUT]
+
+// == Sub commands
+type SubCommands<A> = A extends {
+  readonly type: Discord.ApplicationCommandOptionType.SUB_COMMAND
+  readonly options?: ReadonlyArray<CommandOption>
+}
+  ? A
+  : A extends { readonly options: ReadonlyArray<CommandOption> }
+    ? SubCommands<A["options"][number]>
+    : never
+
+type SubCommandNames<A> = Option<SubCommands<A>>["name"]
+
+// == Command options
+type CommandOptionType = Exclude<
+  Discord.ApplicationCommandOptionType,
+  | Discord.ApplicationCommandOptionType.SUB_COMMAND
+  | Discord.ApplicationCommandOptionType.SUB_COMMAND_GROUP
+>
+
+type CommandOptions<A> = OptionsWithLiteral<
+  A,
+  {
+    readonly type: CommandOptionType
+  }
+>
+
+type SubCommandOptions<A> = Extract<
+  Option<Exclude<SubCommands<A>["options"], undefined>[number]>,
+  {
+    readonly type: CommandOptionType
+  }
+>
+
+type AllCommandOptions<A> = CommandOptions<A> | SubCommandOptions<A>
+
+type CommandWithName<A, N> = Extract<AllCommandOptions<A>, { readonly name: N }>
+
+type OptionTypeValue = {
+  [Discord.ApplicationCommandOptionType.BOOLEAN]: boolean
+  [Discord.ApplicationCommandOptionType.INTEGER]: number
+  [Discord.ApplicationCommandOptionType.NUMBER]: number
+}
+type CommandValue<A, N> = CommandWithName<
+  A,
+  N
+>["type"] extends keyof OptionTypeValue
+  ? OptionTypeValue[CommandWithName<A, N>["type"]]
+  : string
+
+// == Required options
+type RequiredCommandOptions<A> = OptionsWithLiteral<
+  A,
+  {
+    readonly type: CommandOptionType
+    readonly required: true
+  }
+>
+
+type RequiredSubCommandOptions<A> = Extract<
+  SubCommandOptions<A>,
+  { readonly required: true }
+>
+
+type AllRequiredCommandOptions<A> =
+  | RequiredCommandOptions<A>
+  | RequiredSubCommandOptions<A>
+
+// == Resolveables
+type ResolvableType =
+  | Discord.ApplicationCommandOptionType.ROLE
+  | Discord.ApplicationCommandOptionType.USER
+  | Discord.ApplicationCommandOptionType.MENTIONABLE
+  | Discord.ApplicationCommandOptionType.CHANNEL
+
+type Resolvables<A> = OptionsWithLiteral<A, { readonly type: ResolvableType }>
+type SubCommandResolvables<A> = Extract<
+  Option<Exclude<SubCommands<A>["options"], undefined>[number]>,
+  {
+    readonly type: ResolvableType
+  }
+>
+type AllResolvables<A> = Resolvables<A> | SubCommandResolvables<A>
+
+// == Utilities
+type StringLiteral<T> = T extends string
+  ? string extends T
+    ? never
+    : T
+  : never
+
+type Option<A> = A extends { readonly name: infer N }
+  ? N extends StringLiteral<N>
+    ? A
+    : never
+  : never
+
+type OptionsWithLiteral<A, T> = A extends {
+  readonly options: ReadonlyArray<CommandOption>
+}
+  ? Extract<A["options"][number], Option<A["options"][number]> & T>
+  : never

package/src/Interactions/context.ts

@@ -5,9 +5,9 @@ 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/Array"
+// @ts-ignore
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import * as Types from "effect/Types"
 
 export interface DiscordInteraction {
   readonly _: unique symbol
@@ -85,58 +85,12 @@ export class SubCommandNotFound extends TypeIdError(
   data: Discord.ApplicationCommandDatum
 }> {}
 
-export const handleSubCommands = <
-  NER extends Record<
-    string,
-    Effect.Effect<Discord.InteractionResponse, any, any>
-  >,
->(
-  commands: NER,
-): Effect.Effect<
-  Discord.InteractionResponse,
-  | ([NER[keyof NER]] extends [
-      { [Effect.EffectTypeId]: { _E: (_: never) => infer E } },
-    ]
-      ? E
-      : never)
-  | SubCommandNotFound,
-  | Exclude<
-      [NER[keyof NER]] extends [
-        { [Effect.EffectTypeId]: { _R: (_: never) => infer R } },
-      ]
-        ? R
-        : never,
-      SubCommandContext
-    >
-  | Discord.Interaction
-  | Discord.ApplicationCommandDatum
-> =>
-  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: Effect.Effect<
   Discord.ApplicationCommandInteractionDataOption,
   never,
   DiscordSubCommand
 > = Effect.map(SubCommandContext, _ => _.command)
 
-export const optionsMap: Effect.Effect<
-  HashMap.HashMap<string, string | undefined>,
-  never,
-  DiscordApplicationCommand
-> = Effect.map(ApplicationCommand, IxHelpers.optionsMap)
-
 export class RequiredOptionNotFound {
   readonly _tag = "RequiredOptionNotFound"
   constructor(
@@ -147,29 +101,6 @@ export class RequiredOptionNotFound {
   ) {}
 }
 
-export const option = (name: string) =>
-  Effect.map(ApplicationCommand, IxHelpers.getOption(name))
-
-export const optionValue = (name: string) =>
-  Effect.flatMap(option(name), _ =>
-    Option.match(
-      Option.flatMapNullable(_, a => a.value),
-      {
-        onNone: () =>
-          Effect.flatMap(ApplicationCommand, data =>
-            Effect.fail(new RequiredOptionNotFound(data, name)),
-          ),
-        onSome: Effect.succeed,
-      },
-    ),
-  )
-
-export const optionValueOptional = (name: string) =>
-  Effect.map(
-    option(name),
-    Option.flatMapNullable(o => o.value),
-  )
-
 export const modalValues = Effect.map(ModalSubmitData, IxHelpers.componentsMap)
 
 export const modalValueOption = (name: string) =>

package/src/Interactions/definitions.ts

@@ -1,4 +1,3 @@
-import type * as Option from "effect/Option"
 import type * as Effect from "effect/Effect"
 import type {
   DiscordApplicationCommand,
@@ -6,11 +5,10 @@ import type {
   DiscordInteraction,
   DiscordMessageComponent,
   DiscordModalSubmit,
-  SubCommandContext,
 } from "dfx/Interactions/context"
 import type * as Discord from "dfx/types"
-import type { NoSuchElementException } from "effect/Cause"
 import type { Scope } from "effect/Scope"
+import type { CommandHelper } from "./commandHelper"
 
 export type InteractionDefinition<R, E> =
   | GlobalApplicationCommand<R, E>
@@ -129,188 +127,6 @@ export type CommandHandler<R, E, A = any> =
   | Effect.Effect<Discord.InteractionResponse, E, R>
   | CommandHandlerFn<R, E, A>
 
-export interface CommandHelper<A> {
-  readonly target: CommandTypeMap<
-    A,
-    {
-      [Discord.ApplicationCommandType.CHAT_INPUT]: Discord.ApplicationCommand
-      [Discord.ApplicationCommandType.MESSAGE]: Discord.Message
-      [Discord.ApplicationCommandType.USER]: Discord.User
-      [Discord.ApplicationCommandType.PRIMARY_ENTRY_POINT]: undefined
-    }
-  >
-
-  resolve: <T>(
-    name: AllResolvables<A>["name"],
-    f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => T | undefined,
-  ) => Effect.Effect<T, NoSuchElementException, DiscordInteraction>
-
-  option: (
-    name: AllCommandOptions<A>["name"],
-  ) => Effect.Effect<
-    Option.Option<Discord.ApplicationCommandInteractionDataOption>,
-    never,
-    DiscordApplicationCommand
-  >
-
-  optionValue: <N extends AllRequiredCommandOptions<A>["name"]>(
-    name: N,
-  ) => Effect.Effect<CommandValue<A, N>, never, DiscordApplicationCommand>
-
-  optionValueOptional: <N extends AllCommandOptions<A>["name"]>(
-    name: N,
-  ) => Effect.Effect<
-    Option.Option<CommandValue<A, N>>,
-    never,
-    DiscordApplicationCommand
-  >
-
-  subCommands: <
-    NER extends SubCommandNames<A> extends never
-      ? never
-      : Record<
-          SubCommandNames<A>,
-          Effect.Effect<Discord.InteractionResponse, any, any>
-        >,
-  >(
-    commands: NER,
-  ) => Effect.Effect<
-    Discord.InteractionResponse,
-    [NER[keyof NER]] extends [
-      { [Effect.EffectTypeId]: { _E: (_: never) => infer E } },
-    ]
-      ? E
-      : never,
-    | Exclude<
-        [NER[keyof NER]] extends [
-          { [Effect.EffectTypeId]: { _R: (_: never) => infer R } },
-        ]
-          ? R
-          : never,
-        SubCommandContext
-      >
-    | DiscordInteraction
-    | DiscordApplicationCommand
-  >
-}
-
 export type CommandHandlerFn<R, E, A> = (
   i: CommandHelper<A>,
 ) => Effect.Effect<Discord.InteractionResponse, E, R>
-
-interface CommandOption {
-  readonly type: any
-  readonly name: string
-  readonly options?: ReadonlyArray<CommandOption>
-}
-
-// == Sub commands
-type SubCommands<A> = A extends {
-  readonly type: Discord.ApplicationCommandOptionType.SUB_COMMAND
-  readonly options?: ReadonlyArray<CommandOption>
-}
-  ? A
-  : A extends { readonly options: ReadonlyArray<CommandOption> }
-    ? SubCommands<A["options"][number]>
-    : never
-
-type SubCommandNames<A> = Option<SubCommands<A>>["name"]
-
-// == Command options
-type CommandOptionType = Exclude<
-  Discord.ApplicationCommandOptionType,
-  | Discord.ApplicationCommandOptionType.SUB_COMMAND
-  | Discord.ApplicationCommandOptionType.SUB_COMMAND_GROUP
->
-
-type CommandOptions<A> = OptionsWithLiteral<
-  A,
-  {
-    readonly type: CommandOptionType
-  }
->
-
-type SubCommandOptions<A> = Extract<
-  Option<Exclude<SubCommands<A>["options"], undefined>[number]>,
-  {
-    readonly type: CommandOptionType
-  }
->
-
-type AllCommandOptions<A> = CommandOptions<A> | SubCommandOptions<A>
-
-type CommandWithName<A, N> = Extract<AllCommandOptions<A>, { readonly name: N }>
-
-type OptionTypeValue = {
-  [Discord.ApplicationCommandOptionType.BOOLEAN]: boolean
-  [Discord.ApplicationCommandOptionType.INTEGER]: number
-  [Discord.ApplicationCommandOptionType.NUMBER]: number
-}
-type CommandValue<A, N> = CommandWithName<
-  A,
-  N
->["type"] extends keyof OptionTypeValue
-  ? OptionTypeValue[CommandWithName<A, N>["type"]]
-  : string
-
-type CommandTypeMap<
-  A,
-  Options extends Record<Discord.ApplicationCommandType, any>,
-> = A extends { readonly type: infer T }
-  ? T extends keyof Options
-    ? Options[T]
-    : never
-  : Options[Discord.ApplicationCommandType.CHAT_INPUT]
-
-// == Required options
-type RequiredCommandOptions<A> = OptionsWithLiteral<
-  A,
-  {
-    readonly type: CommandOptionType
-    readonly required: true
-  }
->
-
-type RequiredSubCommandOptions<A> = Extract<
-  SubCommandOptions<A>,
-  { readonly required: true }
->
-
-type AllRequiredCommandOptions<A> =
-  | RequiredCommandOptions<A>
-  | RequiredSubCommandOptions<A>
-
-// == Resolveables
-type ResolvableType =
-  | Discord.ApplicationCommandOptionType.ROLE
-  | Discord.ApplicationCommandOptionType.USER
-  | Discord.ApplicationCommandOptionType.MENTIONABLE
-  | Discord.ApplicationCommandOptionType.CHANNEL
-
-type Resolvables<A> = OptionsWithLiteral<A, { readonly type: ResolvableType }>
-type SubCommandResolvables<A> = Extract<
-  Option<Exclude<SubCommands<A>["options"], undefined>[number]>,
-  {
-    readonly type: ResolvableType
-  }
->
-type AllResolvables<A> = Resolvables<A> | SubCommandResolvables<A>
-
-// == Utilities
-type StringLiteral<T> = T extends string
-  ? string extends T
-    ? never
-    : T
-  : never
-
-type Option<A> = A extends { readonly name: infer N }
-  ? N extends StringLiteral<N>
-    ? A
-    : never
-  : never
-
-type OptionsWithLiteral<A, T> = A extends {
-  readonly options: ReadonlyArray<CommandOption>
-}
-  ? Extract<A["options"][number], Option<A["options"][number]> & T>
-  : never