feat: buttons, modals and select menus regroups in components dir

Author: davidabou

src/getters.ts

@@ -23,7 +23,7 @@ import type {
 
 export const getButton = (id: string) => {
   const harmonix = useHarmonix()
-  const button = harmonix.buttons.get(id)
+  const button = harmonix.components.buttons.get(id)
 
   if (!button) return null
   const builder = new ButtonBuilder()
@@ -50,7 +50,7 @@ export const getButton = (id: string) => {
 
 export const getModal = (id: string) => {
   const harmonix = useHarmonix()
-  const modal = harmonix.modals.get(id)
+  const modal = harmonix.components.modals.get(id)
 
   if (!modal) return null
   const builder = new ModalBuilder()
@@ -91,7 +91,7 @@ export const getModal = (id: string) => {
 
 export const getSelectMenu = (id: string) => {
   const harmonix = useHarmonix()
-  const selectMenu = harmonix.selectMenus.get(id)
+  const selectMenu = harmonix.components.selectMenus.get(id)
 
   if (!selectMenu) return null
   const { placeholder, type, disabled, minValues, maxValues } =

src/harmonix.ts

@@ -68,9 +68,11 @@ const initHarmonix = async (
     events: new Collection(),
     commands: new Collection(),
     contextMenus: new Collection(),
-    buttons: new Collection(),
-    modals: new Collection(),
-    selectMenus: new Collection(),
+    components: {
+      buttons: new Collection(),
+      modals: new Collection(),
+      selectMenus: new Collection()
+    },
     preconditions: new Collection()
   }
 }
@@ -84,9 +86,9 @@ const watchReload = (
     harmonix.options.dirs.commands,
     harmonix.options.dirs.events,
     harmonix.options.dirs.contextMenus,
-    harmonix.options.dirs.buttons,
-    harmonix.options.dirs.modals,
-    harmonix.options.dirs.selectMenus,
+    harmonix.options.dirs.components.buttons,
+    harmonix.options.dirs.components.modals,
+    harmonix.options.dirs.components.selectMenus,
     harmonix.options.dirs.preconditions
   ].map((file) => resolve(harmonix.options.rootDir, file))
   const watcher = watch([...filesToWatch, harmonix.configFile], {
@@ -138,9 +140,9 @@ const clearHarmonix = async (harmonix: Harmonix) => {
   harmonix.events.clear()
   harmonix.commands.clear()
   harmonix.contextMenus.clear()
-  harmonix.buttons.clear()
-  harmonix.modals.clear()
-  harmonix.selectMenus.clear()
+  harmonix.components.buttons.clear()
+  harmonix.components.modals.clear()
+  harmonix.components.selectMenus.clear()
   harmonix.preconditions.clear()
 }
 
@@ -181,14 +183,16 @@ const loadHarmonix = async (
     ...(harmonix.options.contextMenus || []),
     ...scannedContextMenus
   ].map((ctm) => resolveContextMenu(ctm, harmonix.options))
-  const buttons = [...(harmonix.options.buttons || []), ...scannedButtons].map(
-    (btn) => resolveButton(btn, harmonix.options)
-  )
-  const modals = [...(harmonix.options.modals || []), ...scannedModals].map(
-    (mdl) => resolveModal(mdl, harmonix.options)
-  )
+  const buttons = [
+    ...(harmonix.options.components?.buttons || []),
+    ...scannedButtons
+  ].map((btn) => resolveButton(btn, harmonix.options))
+  const modals = [
+    ...(harmonix.options.components?.modals || []),
+    ...scannedModals
+  ].map((mdl) => resolveModal(mdl, harmonix.options))
   const selectMenus = [
-    ...(harmonix.options.selectMenus || []),
+    ...(harmonix.options.components?.selectMenus || []),
     ...scannedSelectMenus
   ].map((slm) => resolveSelectMenu(slm, harmonix.options))
   const preconditions = [

src/load.ts

@@ -39,13 +39,13 @@ export const loadContextMenus = (
 
 export const loadButtons = (harmonix: Harmonix, buttons: HarmonixButton[]) => {
   for (const btn of buttons) {
-    harmonix.buttons.set(btn.config.id!, btn)
+    harmonix.components.buttons.set(btn.config.id!, btn)
   }
 }
 
 export const loadModals = (harmonix: Harmonix, modals: HarmonixModal[]) => {
   for (const mdl of modals) {
-    harmonix.modals.set(mdl.config.id!, mdl)
+    harmonix.components.modals.set(mdl.config.id!, mdl)
   }
 }
 
@@ -54,7 +54,7 @@ export const loadSelectMenus = (
   selectMenus: HarmonixSelectMenu[]
 ) => {
   for (const slm of selectMenus) {
-    harmonix.selectMenus.set(slm.config.id!, slm)
+    harmonix.components.selectMenus.set(slm.config.id!, slm)
   }
 }
 

src/options.ts

@@ -46,9 +46,12 @@ export const loadOptions = async (
     commands: 'commands',
     events: 'events',
     contextMenus: 'context-menus',
-    buttons: 'buttons',
-    modals: 'modals',
-    selectMenus: 'select-menus',
+    components: {
+      dir: 'components',
+      buttons: 'buttons',
+      modals: 'modals',
+      selectMenus: 'select-menus'
+    },
     preconditions: 'preconditions'
   })
 

src/register.ts

@@ -108,7 +108,7 @@ export const registerContextMenu = (harmonix: Harmonix) => {
 export const registerButtons = (harmonix: Harmonix) => {
   harmonix.client?.on(Events.InteractionCreate, (interaction) => {
     if (!interaction.isButton()) return
-    const btn = harmonix.buttons.get(interaction.customId)
+    const btn = harmonix.components.buttons.get(interaction.customId)
 
     if (!btn) return
     btn.callback(interaction)
@@ -118,7 +118,7 @@ export const registerButtons = (harmonix: Harmonix) => {
 export const registerModals = (harmonix: Harmonix) => {
   harmonix.client?.on(Events.InteractionCreate, async (interaction) => {
     if (!interaction.isModalSubmit()) return
-    const mdl = harmonix.modals.get(interaction.customId)
+    const mdl = harmonix.components.modals.get(interaction.customId)
 
     if (!mdl) return
     const inputs = Object.keys(mdl.config.inputs ?? {}).reduce<ParsedInputs>(
@@ -136,7 +136,7 @@ export const registerModals = (harmonix: Harmonix) => {
 export const registerSelectMenus = (harmonix: Harmonix) => {
   harmonix.client?.on(Events.InteractionCreate, (interaction) => {
     if (!interaction.isAnySelectMenu()) return
-    const slm = harmonix.selectMenus.get(interaction.customId)
+    const slm = harmonix.components.selectMenus.get(interaction.customId)
 
     if (!slm) return
     slm.callback(interaction, interaction.values)

src/scan.ts

@@ -5,9 +5,7 @@ import type { Harmonix } from './types'
 const GLOB_SCAN_PATTERN = '**/*.{js,ts}'
 
 export const scanEvents = async (harmonix: Harmonix) => {
-  const files = await Promise.all([
-    scanFiles(harmonix, harmonix.options.dirs.events)
-  ]).then((r) => r.flat())
+  const files = await scanFiles(harmonix, harmonix.options.dirs.events)
 
   return files.map((f) => f.fullPath)
 }
@@ -25,19 +23,31 @@ export const scanContextMenus = async (harmonix: Harmonix) => {
 }
 
 export const scanButtons = async (harmonix: Harmonix) => {
-  const files = await scanFiles(harmonix, harmonix.options.dirs.buttons)
+  const buttonsDir = join(
+    harmonix.options.dirs.components.dir,
+    harmonix.options.dirs.components.buttons
+  )
+  const files = await scanFiles(harmonix, buttonsDir)
 
   return files.map((f) => f.fullPath)
 }
 
 export const scanModals = async (harmonix: Harmonix) => {
-  const files = await scanFiles(harmonix, harmonix.options.dirs.modals)
+  const modalsDir = join(
+    harmonix.options.dirs.components.dir,
+    harmonix.options.dirs.components.modals
+  )
+  const files = await scanFiles(harmonix, modalsDir)
 
   return files.map((f) => f.fullPath)
 }
 
 export const scanSelectMenus = async (harmonix: Harmonix) => {
-  const files = await scanFiles(harmonix, harmonix.options.dirs.selectMenus)
+  const selectMenusDir = join(
+    harmonix.options.dirs.components.dir,
+    harmonix.options.dirs.components.selectMenus
+  )
+  const files = await scanFiles(harmonix, selectMenusDir)
 
   return files.map((f) => f.fullPath)
 }

src/types/harmonix.ts

@@ -18,9 +18,12 @@ interface HarmonixDirs {
   events: string
   commands: string
   contextMenus: string
-  buttons: string
-  modals: string
-  selectMenus: string
+  components: {
+    dir: string
+    buttons: string
+    modals: string
+    selectMenus: string
+  }
   preconditions: string
 }
 
@@ -33,9 +36,11 @@ export interface HarmonixOptions {
   events: HarmonixEventInput[]
   commands: HarmonixCommandInput[]
   contextMenus: HarmonixContextMenuInput[]
-  buttons: HarmonixButtonInput[]
-  modals: HarmonixModalInput[]
-  selectMenus: HarmonixSelectMenuInput[]
+  components: {
+    buttons: HarmonixButtonInput[]
+    modals: HarmonixModalInput[]
+    selectMenus: HarmonixSelectMenuInput[]
+  }
   preconditions: HarmonixPreconditionInput[]
   client: ClientOptions
   clientId: string
@@ -58,9 +63,11 @@ export interface Harmonix {
   events: Collection<string, HarmonixEvent>
   commands: Collection<string, HarmonixCommand>
   contextMenus: Collection<string, HarmonixContextMenu>
-  buttons: Collection<string, HarmonixButton>
-  modals: Collection<string, HarmonixModal>
-  selectMenus: Collection<string, HarmonixSelectMenu>
+  components: {
+    buttons: Collection<string, HarmonixButton>
+    modals: Collection<string, HarmonixModal>
+    selectMenus: Collection<string, HarmonixSelectMenu>
+  }
   preconditions: Collection<string, HarmonixPrecondition>
 }
 

src/uses.ts

@@ -19,9 +19,9 @@ import type { EmbedOptions } from './types'
 import { getButton, getModal, getSelectMenu } from './getters'
 
 export const useButtons = () => {
-  const { buttons } = useHarmonix()
+  const { components } = useHarmonix()
 
-  return buttons.reduce(
+  return components.buttons.reduce(
     (acc, button) => {
       if (button.config.id) {
         acc[button.config.id] = getButton(button.config.id) ?? undefined
@@ -33,9 +33,9 @@ export const useButtons = () => {
 }
 
 export const useModals = () => {
-  const { modals } = useHarmonix()
+  const { components } = useHarmonix()
 
-  return modals.reduce(
+  return components.modals.reduce(
     (acc, modal) => {
       if (modal.config.id) {
         acc[modal.config.id] = getModal(modal.config.id) ?? undefined
@@ -47,9 +47,9 @@ export const useModals = () => {
 }
 
 export const useSelectMenus = () => {
-  const { selectMenus } = useHarmonix()
+  const { components } = useHarmonix()
 
-  return selectMenus.reduce(
+  return components.selectMenus.reduce(
     (acc, selectMenu) => {
       if (selectMenu.config.id) {
         acc[selectMenu.config.id] =