dfx 0.91.3 → 0.92.0

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","_","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":"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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","_","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":[]}

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,CAMpBJ,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,CAMnBN,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,SAA6D,EAC7DP,MAAwD;IADxD,KAAAO,SAAS,GAATA,SAAS;IACT,KAAAP,MAAM,GAANA,MAAM;EACd;;AAGL,OAAO,MAAMQ,gBAAgB,GAAGA,CAC9BC,IAA0D,EAC1DT,MAA2D,KAE3D,IAAIM,gBAAgB,CAGlBG,IAAW,EAAET,MAAa,CAAC;AAE/B,OAAM,MAAOU,WAAW;EAGXH,SAAA;EACAP,MAAA;EAHFC,IAAI,GAAG,aAAa;EAC7BC,YACWK,SAA6D,EAC7DP,MAAwD;IADxD,KAAAO,SAAS,GAATA,SAAS;IACT,KAAAP,MAAM,GAANA,MAAM;EACd;;AAGL,OAAO,MAAMW,WAAW,GAAGA,CACzBF,IAA0D,EAC1DT,MAA0D,KAE1D,IAAIU,WAAW,CAGbD,IAAW,EAAET,MAAa,CAAC;AAE/B,OAAM,MAAOY,YAAY;EAGZL,SAAA;EAIAP,MAAA;EANFC,IAAI,GAAG,cAAc;EAC9BC,YACWK,SAGwB,EACxBP,MAAwD;IAJxD,KAAAO,SAAS,GAATA,SAAS;IAIT,KAAAP,MAAM,GAANA,MAAM;EACd;;AAGL,OAAO,MAAMa,YAAY,GAAGA,CAC1BJ,IAGmC,EACnCT,MAA0D,KAE1D,IAAIY,YAAY,CASdH,IAAW,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":"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":[]}

package/mjs/Interactions/handlers.mjs

@@ -1,4 +1,3 @@
-import * as Option from "effect/Option";
 import * as Effect from "effect/Effect";
 import * as IxHelpers from "dfx/Helpers/interactions";
 import * as Ctx from "dfx/Interactions/context";
@@ -20,41 +19,44 @@ export const handlers = (definitions, handleResponse) => {
     ModalSubmit
   } = splitDefinitions(flattened);
   return {
-    [Discord.InteractionType.PING]: () => Effect.succeed({
+    [Discord.InteractionType.PING]: _ => Effect.succeed({
       type: Discord.InteractionCallbackType.PONG
     }),
     [Discord.InteractionType.APPLICATION_COMMAND]: i => {
       const data = i.data;
-      return Option.match(Option.fromNullable(Commands[data.name]), {
-        onNone: () => Effect.fail(new DefinitionNotFound(i)),
-        onSome: command => Effect.provideService(command.handle(i), Ctx.ApplicationCommand, data)
-      });
+      const command = Commands[data.name];
+      if (command === undefined) {
+        return Effect.fail(new DefinitionNotFound(i));
+      }
+      return Effect.provideService(command.handle(i), Ctx.ApplicationCommand, data);
     },
     [Discord.InteractionType.MODAL_SUBMIT]: i => {
       const data = i.data;
-      return Effect.findFirst(ModalSubmit, _ => _.predicate(data.custom_id)).pipe(Effect.flatMap(Option.match({
-        onNone: () => Effect.fail(new DefinitionNotFound(i)),
-        onSome: match => Effect.provideService(match.handle(i), Ctx.ModalSubmitData, data)
-      })));
+      const match = ModalSubmit.find(_ => _.predicate(data.custom_id));
+      if (match === undefined) {
+        return Effect.fail(new DefinitionNotFound(i));
+      }
+      return Effect.provideService(match.handle(i), Ctx.ModalSubmitData, data);
     },
     [Discord.InteractionType.MESSAGE_COMPONENT]: i => {
       const data = i.data;
-      return Effect.findFirst(MessageComponent, _ => _.predicate(data.custom_id)).pipe(Effect.flatMap(Option.match({
-        onNone: () => Effect.fail(new DefinitionNotFound(i)),
-        onSome: match => Effect.provideService(match.handle(i), Ctx.MessageComponentData, data)
-      })));
+      const match = MessageComponent.find(_ => _.predicate(data.custom_id));
+      if (match === undefined) {
+        return Effect.fail(new DefinitionNotFound(i));
+      }
+      return Effect.provideService(match.handle(i), Ctx.MessageComponentData, data);
     },
     [Discord.InteractionType.APPLICATION_COMMAND_AUTOCOMPLETE]: i => {
       const data = i.data;
-      return Option.match(IxHelpers.focusedOption(data), {
-        onNone: () => Effect.fail(new DefinitionNotFound(i)),
-        onSome: focusedOption => Effect.findFirst(Autocomplete, _ => _.predicate(data, focusedOption)).pipe(Effect.flatMap(Option.match({
-          onNone: () => Effect.fail(new DefinitionNotFound(i)),
-          onSome: match => Effect.provideService(match.handle(i), Ctx.ApplicationCommand, data).pipe(Effect.provideService(Ctx.FocusedOptionContext, {
-            focusedOption
-          }))
-        })))
-      });
+      const option = IxHelpers.focusedOption(data);
+      if (option._tag === "None") {
+        return Effect.fail(new DefinitionNotFound(i));
+      }
+      const match = Autocomplete.find(_ => _.predicate(data, option.value));
+      if (match === undefined) {
+        return Effect.fail(new DefinitionNotFound(i));
+      }
+      return match.handle(i).pipe(Effect.provideService(Ctx.ApplicationCommand, data), Effect.provideService(Ctx.FocusedOptionContext, option.value));
     }
   };
 };

package/mjs/Interactions/handlers.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"handlers.mjs","names":["Option","Effect","IxHelpers","Ctx","flattenDefinitions","splitDefinitions","Discord","DefinitionNotFound","interaction","_tag","constructor","handlers","definitions","handleResponse","flattened","Autocomplete","Commands","MessageComponent","ModalSubmit","InteractionType","PING","succeed","type","InteractionCallbackType","PONG","APPLICATION_COMMAND","i","data","match","fromNullable","name","onNone","fail","onSome","command","provideService","handle","ApplicationCommand","MODAL_SUBMIT","findFirst","_","predicate","custom_id","pipe","flatMap","ModalSubmitData","MESSAGE_COMPONENT","MessageComponentData","APPLICATION_COMMAND_AUTOCOMPLETE","focusedOption","FocusedOptionContext"],"sources":["../../src/Interactions/handlers.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"handlers.mjs","names":["Effect","IxHelpers","Ctx","flattenDefinitions","splitDefinitions","Discord","DefinitionNotFound","interaction","_tag","constructor","handlers","definitions","handleResponse","flattened","Autocomplete","Commands","MessageComponent","ModalSubmit","InteractionType","PING","_","succeed","type","InteractionCallbackType","PONG","APPLICATION_COMMAND","i","data","command","name","undefined","fail","provideService","handle","ApplicationCommand","MODAL_SUBMIT","match","find","predicate","custom_id","ModalSubmitData","MESSAGE_COMPONENT","MessageComponentData","APPLICATION_COMMAND_AUTOCOMPLETE","option","focusedOption","value","pipe","FocusedOptionContext"],"sources":["../../src/Interactions/handlers.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/mjs/Interactions/index.mjs

@@ -1,12 +1,11 @@
-import * as Effect from "effect/Effect";
 export { response } from "dfx/Helpers/interactions";
 export * from "dfx/Interactions/builder";
 export * from "dfx/Interactions/context";
 export { autocomplete, global, guild, messageComponent, modalSubmit } from "dfx/Interactions/definitions";
 // Filters
-export const id = query => customId => Effect.succeed(query === customId);
-export const idStartsWith = query => customId => Effect.succeed(customId.startsWith(query));
-export const idRegex = query => customId => Effect.succeed(query.test(customId));
-export const option = (command, optionName) => (data, focusedOption) => Effect.succeed(data.name === command && focusedOption.name === optionName);
-export const optionOnly = optionName => (_, focusedOption) => Effect.succeed(focusedOption.name === optionName);
+export const id = query => customId => query === customId;
+export const idStartsWith = query => customId => customId.startsWith(query);
+export const idRegex = query => customId => query.test(customId);
+export const option = (command, optionName) => (data, focusedOption) => data.name === command && focusedOption.name === optionName;
+export const optionOnly = optionName => (_, focusedOption) => focusedOption.name === optionName;
 //# sourceMappingURL=index.mjs.map

package/mjs/Interactions/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":["Effect","response","autocomplete","global","guild","messageComponent","modalSubmit","id","query","customId","succeed","idStartsWith","startsWith","idRegex","test","option","command","optionName","data","focusedOption","name","optionOnly","_"],"sources":["../../src/Interactions/index.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,MAAM,MAAM,eAAe;AAGvC,SAASC,QAAQ,QAAQ,0BAA0B;AACnD,cAAc,0BAA0B;AACxC,cAAc,0BAA0B;AACxC,SACEC,YAAY,EACZC,MAAM,EACNC,KAAK,EAELC,gBAAgB,EAChBC,WAAW,QACN,8BAA8B;AAErC;AACA,OAAO,MAAMC,EAAE,GAAIC,KAAa,IAAMC,QAAgB,IACpDT,MAAM,CAACU,OAAO,CAACF,KAAK,KAAKC,QAAQ,CAAC;AAEpC,OAAO,MAAME,YAAY,GAAIH,KAAa,IAAMC,QAAgB,IAC9DT,MAAM,CAACU,OAAO,CAACD,QAAQ,CAACG,UAAU,CAACJ,KAAK,CAAC,CAAC;AAE5C,OAAO,MAAMK,OAAO,GAAIL,KAAa,IAAMC,QAAgB,IACzDT,MAAM,CAACU,OAAO,CAACF,KAAK,CAACM,IAAI,CAACL,QAAQ,CAAC,CAAC;AAEtC,OAAO,MAAMM,MAAM,GACjBA,CAACC,OAAe,EAAEC,UAAkB,KACpC,CACEC,IAAmD,EACnDC,aAGC,KAEDnB,MAAM,CAACU,OAAO,CAACQ,IAAI,CAACE,IAAI,KAAKJ,OAAO,IAAIG,aAAa,CAACC,IAAI,KAAKH,UAAU,CAAC;AAE9E,OAAO,MAAMI,UAAU,GACpBJ,UAAkB,IACnB,CACEK,CAAU,EACVH,aAGC,KAEDnB,MAAM,CAACU,OAAO,CAACS,aAAa,CAACC,IAAI,KAAKH,UAAU,CAAC","ignoreList":[]}
+{"version":3,"file":"index.mjs","names":["response","autocomplete","global","guild","messageComponent","modalSubmit","id","query","customId","idStartsWith","startsWith","idRegex","test","option","command","optionName","data","focusedOption","name","optionOnly","_"],"sources":["../../src/Interactions/index.ts"],"sourcesContent":[null],"mappings":"AAEA,SAASA,QAAQ,QAAQ,0BAA0B;AACnD,cAAc,0BAA0B;AACxC,cAAc,0BAA0B;AACxC,SACEC,YAAY,EACZC,MAAM,EACNC,KAAK,EAELC,gBAAgB,EAChBC,WAAW,QACN,8BAA8B;AAErC;AACA,OAAO,MAAMC,EAAE,GAAIC,KAAa,IAAMC,QAAgB,IAAKD,KAAK,KAAKC,QAAQ;AAE7E,OAAO,MAAMC,YAAY,GAAIF,KAAa,IAAMC,QAAgB,IAC9DA,QAAQ,CAACE,UAAU,CAACH,KAAK,CAAC;AAE5B,OAAO,MAAMI,OAAO,GAAIJ,KAAa,IAAMC,QAAgB,IACzDD,KAAK,CAACK,IAAI,CAACJ,QAAQ,CAAC;AAEtB,OAAO,MAAMK,MAAM,GACjBA,CAACC,OAAe,EAAEC,UAAkB,KACpC,CACEC,IAAmD,EACnDC,aAGC,KAEDD,IAAI,CAACE,IAAI,KAAKJ,OAAO,IAAIG,aAAa,CAACC,IAAI,KAAKH,UAAU;AAE9D,OAAO,MAAMI,UAAU,GACpBJ,UAAkB,IACnB,CACEK,CAAU,EACVH,aAGC,KAEDA,aAAa,CAACC,IAAI,KAAKH,UAAU","ignoreList":[]}

package/mjs/Interactions/utils.mjs

@@ -1,6 +1,7 @@
 import * as Chunk from "effect/Chunk";
 import * as Effect from "effect/Effect";
 import * as Ctx from "dfx/Interactions/context";
+import * as ReadonlyArray from "effect/ReadonlyArray";
 const context = {
   resolve: Ctx.resolved,
   option: Ctx.option,
@@ -8,28 +9,25 @@ const context = {
   optionValueOptional: Ctx.optionValueOptional,
   subCommands: Ctx.handleSubCommands
 };
-export const flattenDefinitions = (definitions, handleResponse) => Chunk.map(definitions, ([definition, transform]) => ({
+export const flattenDefinitions = (definitions, handleResponse) => ReadonlyArray.map(Chunk.toReadonlyArray(definitions), ([definition, transform]) => ({
   ...definition,
-  handle: i => Effect.scoped(Effect.isEffect(definition.handle) ? transform(Effect.flatMap(definition.handle, _ => handleResponse(i, _))) : transform(Effect.flatMap(definition.handle(context), _ => 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(context), _ => handleResponse(i, _))))
 }));
 export const splitDefinitions = definitions => {
-  const grouped = Chunk.reduce(definitions, {
-    Autocomplete: Chunk.empty(),
-    GlobalApplicationCommand: Chunk.empty(),
-    GuildApplicationCommand: Chunk.empty(),
-    MessageComponent: Chunk.empty(),
-    ModalSubmit: Chunk.empty()
-  }, (acc, d) => ({
-    ...acc,
-    [d._tag]: Chunk.append(acc[d._tag], d)
-  }));
-  const Commands = Chunk.appendAll(grouped.GlobalApplicationCommand, grouped.GuildApplicationCommand).pipe(Chunk.reduce({}, (acc, d) => ({
-    ...acc,
-    [d.command.name]: d
-  })));
-  return {
-    ...grouped,
-    Commands
-  };
+  const grouped = ReadonlyArray.reduce(definitions, {
+    Autocomplete: [],
+    GlobalApplicationCommand: [],
+    GuildApplicationCommand: [],
+    MessageComponent: [],
+    ModalSubmit: [],
+    Commands: {}
+  }, (acc, d) => {
+    acc[d._tag].push(d);
+    if (d._tag === "GlobalApplicationCommand" || d._tag === "GuildApplicationCommand") {
+      acc.Commands[d.command.name] = d;
+    }
+    return acc;
+  });
+  return grouped;
 };
 //# sourceMappingURL=utils.mjs.map

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","scoped","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,MAAM,CACXlB,MAAM,CAACmB,QAAQ,CAACL,UAAU,CAACE,MAAM,CAAC,GAC9BD,SAAS,CACPf,MAAM,CAACoB,OAAO,CAACN,UAAU,CAACE,MAAM,EAAEK,CAAC,IAAIT,cAAc,CAACK,CAAC,EAAEI,CAAC,CAAC,CAAC,CAC7D,GACDN,SAAS,CACPf,MAAM,CAACoB,OAAO,CAACN,UAAU,CAACE,MAAM,CAACd,OAAO,CAAC,EAAEmB,CAAC,IAC1CT,cAAc,CAACK,CAAC,EAAEI,CAAC,CAAC,CACrB,CACF;CAEV,CAAC,CAAC;AAEL,OAAO,MAAMC,gBAAgB,GAC3BX,WAA0D,IACxD;EACF,MAAMY,OAAO,GAAGxB,KAAK,CAACyB,MAAM,CAC1Bb,WAAW,EACX;IACEc,YAAY,EAAE1B,KAAK,CAAC2B,KAAK,EAAE;IAC3BC,wBAAwB,EAAE5B,KAAK,CAAC2B,KAAK,EAAE;IACvCE,uBAAuB,EAAE7B,KAAK,CAAC2B,KAAK,EAAE;IACtCG,gBAAgB,EAAE9B,KAAK,CAAC2B,KAAK,EAAE;IAC/BI,WAAW,EAAE/B,KAAK,CAAC2B,KAAK;GAKzB,EACD,CAACK,GAAG,EAAEC,CAAC,MAAM;IACX,GAAGD,GAAG;IACN,CAACC,CAAC,CAACC,IAAI,GAAGlC,KAAK,CAACmC,MAAM,CAACH,GAAG,CAACC,CAAC,CAACC,IAAI,CAAqB,EAAED,CAAC;GAC1D,CAAC,CACH;EAED,MAAMG,QAAQ,GAAGpC,KAAK,CAACqC,SAAS,CAC9Bb,OAAO,CAACI,wBAAwB,EAChCJ,OAAO,CAACK,uBAAuB,CAChC,CAACS,IAAI,CACJtC,KAAK,CAACyB,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","ignoreList":[]}
+{"version":3,"file":"utils.mjs","names":["Chunk","Effect","Ctx","ReadonlyArray","context","resolve","resolved","option","optionValue","optionValueOptional","subCommands","handleSubCommands","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;AACvC,OAAO,KAAKC,GAAG,MAAM,0BAA0B;AAG/C,OAAO,KAAKC,aAAa,MAAM,sBAAsB;AAgBrD,MAAMC,OAAO,GAAyB;EACpCC,OAAO,EAAEH,GAAG,CAACI,QAAQ;EACrBC,MAAM,EAAEL,GAAG,CAACK,MAAM;EAClBC,WAAW,EAAEN,GAAG,CAACM,WAAW;EAC5BC,mBAAmB,EAAEP,GAAG,CAACO,mBAAmB;EAC5CC,WAAW,EAAER,GAAG,CAACS;CACX;AAER,OAAO,MAAMC,kBAAkB,GAAGA,CAChCC,WAKC,EACDC,cAG2B,KAE3BX,aAAa,CAACY,GAAG,CACff,KAAK,CAACgB,eAAe,CAACH,WAAW,CAAC,EAClC,CAAC,CAACI,UAAU,EAAEC,SAAS,CAAC,MAAM;EAC5B,GAAGD,UAAU;EACbE,MAAM,EAAElB,MAAM,CAACmB,QAAQ,CAACH,UAAU,CAACE,MAAM,CAAC,GACrCE,CAAsB,IACrBpB,MAAM,CAACqB,MAAM,CACXJ,SAAS,CACPjB,MAAM,CAACsB,OAAO,CACZN,UAAU,CAACE,MAAoD,EAC/DK,CAAC,IAAIV,cAAc,CAACO,CAAC,EAAEG,CAAC,CAAC,CAC1B,CACF,CACF,GACFH,CAAsB,IACrBpB,MAAM,CAACqB,MAAM,CACXJ,SAAS,CACPjB,MAAM,CAACsB,OAAO,CAEVN,UAAU,CAACE,MAGZ,CAACf,OAAO,CAAC,EACVoB,CAAC,IAAIV,cAAc,CAACO,CAAC,EAAEG,CAAC,CAAC,CAC1B,CACF;CAEV,CAAC,CACH;AAEH,OAAO,MAAMC,gBAAgB,GAC3BZ,WAA4D,IAC1D;EACF,MAAMa,OAAO,GAAGvB,aAAa,CAACwB,MAAM,CAClCd,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.91.3";
+export const LIB_VERSION = "0.92.0";
 //# sourceMappingURL=version.mjs.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dfx",
-  "version": "0.91.3",
+  "version": "0.92.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": "372f842c1e1debf397ac330245eb3bcd263ff1e9",
+  "gitHead": "6291412296e712de6a82e26bcdd3dc119c69a3ce",
   "main": "./index.js"
 }

package/src/Interactions/context.ts

@@ -43,12 +43,9 @@ export const ModalSubmitData = GenericTag<
 export interface DiscordFocusedOption {
   readonly _: unique symbol
 }
-export interface FocusedOptionContext {
-  readonly focusedOption: Discord.ApplicationCommandInteractionDataOption
-}
 export const FocusedOptionContext = GenericTag<
   DiscordFocusedOption,
-  FocusedOptionContext
+  Discord.ApplicationCommandInteractionDataOption
 >("dfx/Interactions/FocusedOptionContext")
 
 export interface DiscordSubCommand {
@@ -78,7 +75,7 @@ export const resolved = <A>(
 
 export const focusedOptionValue = Effect.map(
   FocusedOptionContext,
-  _ => _.focusedOption.value ?? "",
+  _ => _.value ?? "",
 )
 
 export class SubCommandNotFound extends TypeIdError(

package/src/Interactions/definitions.ts

@@ -30,8 +30,7 @@ export class GlobalApplicationCommand<R, E> {
 export const global = <
   R,
   E,
-  const A extends
-    DeepReadonlyObject<Discord.CreateGlobalApplicationCommandParams>,
+  const A extends Discord.CreateGlobalApplicationCommandParams,
 >(
   command: A,
   handle: CommandHandler<R, E, A>,
@@ -52,8 +51,7 @@ export class GuildApplicationCommand<R, E> {
 export const guild = <
   R,
   E,
-  const A extends
-    DeepReadonlyObject<Discord.CreateGuildApplicationCommandParams>,
+  const A extends Discord.CreateGuildApplicationCommandParams,
 >(
   command: A,
   handle: CommandHandler<R, E, A>,
@@ -66,36 +64,36 @@ export const guild = <
 export class MessageComponent<R, E> {
   readonly _tag = "MessageComponent"
   constructor(
-    readonly predicate: (customId: string) => Effect.Effect<boolean, E, R>,
+    readonly predicate: (customId: string) => boolean,
     readonly handle: Effect.Effect<Discord.InteractionResponse, E, R>,
   ) {}
 }
 
-export const messageComponent = <R1, R2, E1, E2>(
-  pred: (customId: string) => Effect.Effect<boolean, E1, R1>,
-  handle: CommandHandler<R2, E2, Discord.InteractionResponse>,
+export const messageComponent = <R, E>(
+  pred: (customId: string) => boolean,
+  handle: CommandHandler<R, E, Discord.InteractionResponse>,
 ) =>
   new MessageComponent<
-    Exclude<R1 | R2, DiscordInteraction | DiscordMessageComponent | Scope>,
-    E1 | E2
-  >(pred as any, handle as any)
+    Exclude<R, DiscordInteraction | DiscordMessageComponent | Scope>,
+    E
+  >(pred, handle as any)
 
 export class ModalSubmit<R, E> {
   readonly _tag = "ModalSubmit"
   constructor(
-    readonly predicate: (customId: string) => Effect.Effect<boolean, E, R>,
+    readonly predicate: (customId: string) => boolean,
     readonly handle: Effect.Effect<Discord.InteractionResponse, E, R>,
   ) {}
 }
 
-export const modalSubmit = <R1, R2, E1, E2>(
-  pred: (customId: string) => Effect.Effect<boolean, E1, R1>,
-  handle: Effect.Effect<Discord.InteractionResponse, E2, R2>,
+export const modalSubmit = <R, E>(
+  pred: (customId: string) => boolean,
+  handle: Effect.Effect<Discord.InteractionResponse, E, R>,
 ) =>
   new ModalSubmit<
-    Exclude<R1 | R2, DiscordInteraction | DiscordModalSubmit | Scope>,
-    E1 | E2
-  >(pred as any, handle as any)
+    Exclude<R, DiscordInteraction | DiscordModalSubmit | Scope>,
+    E
+  >(pred, handle as any)
 
 export class Autocomplete<R, E> {
   readonly _tag = "Autocomplete"
@@ -103,42 +101,30 @@ export class Autocomplete<R, E> {
     readonly predicate: (
       data: Discord.ApplicationCommandDatum,
       focusedOption: Discord.ApplicationCommandInteractionDataOption,
-    ) => Effect.Effect<boolean, E, R>,
+    ) => boolean,
     readonly handle: Effect.Effect<Discord.InteractionResponse, E, R>,
   ) {}
 }
 
-export const autocomplete = <R1, R2, E1, E2>(
+export const autocomplete = <R, E>(
   pred: (
     data: Discord.ApplicationCommandDatum,
     focusedOption: Discord.ApplicationCommandInteractionDataOption,
-  ) => Effect.Effect<boolean, E1, R1>,
-  handle: Effect.Effect<Discord.InteractionResponse, E2, R2>,
+  ) => boolean,
+  handle: Effect.Effect<Discord.InteractionResponse, E, R>,
 ) =>
   new Autocomplete<
     Exclude<
-      R1 | R2,
+      R,
       | DiscordInteraction
       | DiscordApplicationCommand
       | DiscordFocusedOption
       | Scope
     >,
-    E1 | E2
-  >(pred as any, handle as any)
+    E
+  >(pred, handle as any)
 
 // ==== Command handler helpers
-type DeepReadonly<T> =
-  T extends Array<infer R>
-    ? ReadonlyArray<DeepReadonly<R>>
-    : T extends Function
-      ? T
-      : T extends object
-        ? DeepReadonlyObject<T>
-        : T
-type DeepReadonlyObject<T> = {
-  readonly [P in keyof T]: DeepReadonly<T[P]>
-}
-
 export type CommandHandler<R, E, A = any> =
   | Effect.Effect<Discord.InteractionResponse, E, R>
   | CommandHandlerFn<R, E, A>

package/src/Interactions/handlers.ts

@@ -1,5 +1,4 @@
 import type * as Chunk from "effect/Chunk"
-import * as Option from "effect/Option"
 import * as Effect from "effect/Effect"
 import * as IxHelpers from "dfx/Helpers/interactions"
 import * as Ctx from "dfx/Interactions/context"
@@ -40,91 +39,66 @@ export const handlers = <R, E, TE, A, B>(
     splitDefinitions(flattened)
 
   return {
-    [Discord.InteractionType.PING]: () =>
+    [Discord.InteractionType.PING]: _ =>
       Effect.succeed({
         type: Discord.InteractionCallbackType.PONG,
       } as any),
 
     [Discord.InteractionType.APPLICATION_COMMAND]: i => {
       const data = i.data as Discord.ApplicationCommandDatum
-
-      return Option.match(Option.fromNullable(Commands[data.name]), {
-        onNone: () => Effect.fail(new DefinitionNotFound(i)),
-        onSome: command =>
-          Effect.provideService(
-            command.handle(i),
-            Ctx.ApplicationCommand,
-            data,
-          ) as Handler<Exclude<R, Scope>, E, B>,
-      })
+      const command = Commands[data.name]
+      if (command === undefined) {
+        return Effect.fail(new DefinitionNotFound(i))
+      }
+      return Effect.provideService(
+        command.handle(i),
+        Ctx.ApplicationCommand,
+        data,
+      ) as Handler<Exclude<R, Scope>, E, B>
     },
 
     [Discord.InteractionType.MODAL_SUBMIT]: i => {
       const data = i.data as Discord.ModalSubmitDatum
-
-      return Effect.findFirst(ModalSubmit, _ =>
-        _.predicate(data.custom_id),
-      ).pipe(
-        Effect.flatMap(
-          Option.match({
-            onNone: () => Effect.fail(new DefinitionNotFound(i)),
-            onSome: match =>
-              Effect.provideService(
-                match.handle(i),
-                Ctx.ModalSubmitData,
-                data,
-              ) as Handler<R, E, B>,
-          }),
-        ),
+      const match = ModalSubmit.find(_ => _.predicate(data.custom_id))
+      if (match === undefined) {
+        return Effect.fail(new DefinitionNotFound(i))
+      }
+      return Effect.provideService(
+        match.handle(i),
+        Ctx.ModalSubmitData,
+        data,
       ) as Handler<Exclude<R, Scope>, E, B>
     },
 
     [Discord.InteractionType.MESSAGE_COMPONENT]: i => {
       const data = i.data as Discord.MessageComponentDatum
-
-      return Effect.findFirst(MessageComponent, _ =>
-        _.predicate(data.custom_id),
-      ).pipe(
-        Effect.flatMap(
-          Option.match({
-            onNone: () => Effect.fail(new DefinitionNotFound(i)),
-            onSome: match =>
-              Effect.provideService(
-                match.handle(i),
-                Ctx.MessageComponentData,
-                data,
-              ) as Handler<R, E, B>,
-          }),
-        ),
+      const match = MessageComponent.find(_ => _.predicate(data.custom_id))
+      if (match === undefined) {
+        return Effect.fail(new DefinitionNotFound(i))
+      }
+      return Effect.provideService(
+        match.handle(i),
+        Ctx.MessageComponentData,
+        data,
       ) as Handler<Exclude<R, Scope>, E, B>
     },
 
     [Discord.InteractionType.APPLICATION_COMMAND_AUTOCOMPLETE]: i => {
       const data = i.data as Discord.ApplicationCommandDatum
-
-      return Option.match(IxHelpers.focusedOption(data), {
-        onNone: () => Effect.fail(new DefinitionNotFound(i)),
-        onSome: focusedOption =>
-          Effect.findFirst(Autocomplete, _ =>
-            _.predicate(data, focusedOption),
-          ).pipe(
-            Effect.flatMap(
-              Option.match({
-                onNone: () => Effect.fail(new DefinitionNotFound(i)),
-                onSome: match =>
-                  Effect.provideService(
-                    match.handle(i),
-                    Ctx.ApplicationCommand,
-                    data,
-                  ).pipe(
-                    Effect.provideService(Ctx.FocusedOptionContext, {
-                      focusedOption,
-                    }),
-                  ) as Handler<R, E, B>,
-              }),
-            ),
-          ),
-      }) as Handler<Exclude<R, Scope>, E, B>
+      const option = IxHelpers.focusedOption(data)
+      if (option._tag === "None") {
+        return Effect.fail(new DefinitionNotFound(i))
+      }
+      const match = Autocomplete.find(_ => _.predicate(data, option.value))
+      if (match === undefined) {
+        return Effect.fail(new DefinitionNotFound(i))
+      }
+      return match
+        .handle(i)
+        .pipe(
+          Effect.provideService(Ctx.ApplicationCommand, data),
+          Effect.provideService(Ctx.FocusedOptionContext, option.value),
+        ) as Handler<Exclude<R, Scope>, E, B>
     },
   }
 }

package/src/Interactions/index.ts

@@ -1,4 +1,3 @@
-import * as Effect from "effect/Effect"
 import type * as Discord from "dfx/types"
 
 export { response } from "dfx/Helpers/interactions"
@@ -14,14 +13,13 @@ export {
 } from "dfx/Interactions/definitions"
 
 // Filters
-export const id = (query: string) => (customId: string) =>
-  Effect.succeed(query === customId)
+export const id = (query: string) => (customId: string) => query === customId
 
 export const idStartsWith = (query: string) => (customId: string) =>
-  Effect.succeed(customId.startsWith(query))
+  customId.startsWith(query)
 
 export const idRegex = (query: RegExp) => (customId: string) =>
-  Effect.succeed(query.test(customId))
+  query.test(customId)
 
 export const option =
   (command: string, optionName: string) =>
@@ -32,7 +30,7 @@ export const option =
       "name"
     >,
   ) =>
-    Effect.succeed(data.name === command && focusedOption.name === optionName)
+    data.name === command && focusedOption.name === optionName
 
 export const optionOnly =
   (optionName: string) =>
@@ -43,4 +41,4 @@ export const optionOnly =
       "name"
     >,
   ) =>
-    Effect.succeed(focusedOption.name === optionName)
+    focusedOption.name === optionName