Merge branch 'main' into sincetagsandmoredocumentation

.github/workflows/npm-publish.yml

@@ -13,9 +13,9 @@ jobs:
       - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
       - uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
         with:
-          node-version: 18
-      - run: npm i
-      - run: npm run build:prod
+          node-version: 17
+      - run: yarn --immutable
+      - run: yarn build:prod
       - uses: JS-DevTools/npm-publish@0f451a94170d1699fd50710966d48fb26194d939 # v1
         with:
           token: ${{ secrets.NPM_TOKEN }}

.github/workflows/test.yml

@@ -24,5 +24,6 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'npm'
-    - run: npm install
-    - run: npm run test
+    - run: npm install -g yarn
+    - run: yarn install
+    - run: yarn test

.yarnrc.yml

@@ -0,0 +1,5 @@
+enableGlobalCache: true
+
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-3.5.1.cjs

CHANGELOG.md

@@ -1,19 +1,5 @@
 # Changelog
 
-## [4.2.3](https://github.com/sern-handler/handler/compare/v4.2.2...v4.2.3) (2025-03-04)
-
-
-### Bug Fixes
-
-* autocomplete sdt.module not present ([#393](https://github.com/sern-handler/handler/issues/393)) ([2414992](https://github.com/sern-handler/handler/commit/2414992b73a40065464b20f2d53826c78fcd3a5f))
-
-## [4.2.2](https://github.com/sern-handler/handler/compare/v4.2.1...v4.2.2) (2025-02-03)
-
-
-### Bug Fixes
-
-* faster autocomplete lookup ([#387](https://github.com/sern-handler/handler/issues/387)) ([974c30f](https://github.com/sern-handler/handler/commit/974c30fa6cccaae7b1c2c3246ffa9eecb6bc7bf9))
-
 ## [4.2.1](https://github.com/sern-handler/handler/compare/v4.2.0...v4.2.1) (2025-01-24)
 
 

README.md

@@ -7,7 +7,6 @@
 
 <div align="center" styles="margin-top: 10px">
   <img src="https://img.shields.io/badge/open-source-brightgreen" />
-  <img src="https://img.shields.io/badge/built_with-sern-pink?labelColor=%230C3478&color=%23ed5087&link=https%3A%2F%2Fsern.dev"/>
   <a href="https://www.npmjs.com/package/@sern/handler"><img src="https://img.shields.io/npm/v/@sern/handler?maxAge=3600" alt="NPM version" /></a>
   <a href="https://www.npmjs.com/package/@sern/handler"><img src="https://img.shields.io/npm/dt/@sern/handler?maxAge=3600" alt="NPM downloads" /></a>
   <a href="https://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/license-MIT-brightgreen" alt="License MIT" /></a>
@@ -44,11 +43,6 @@ export default commandModule({
 ```
 </details>
 
-# Show off your sern Discord Bot!
-
-## Badge
-- Copy this and add it to your [README.md](https://img.shields.io/badge/built_with-sern-pink?labelColor=%230C3478&color=%23ed5087&link=https%3A%2F%2Fsern.dev)
-<img src="https://img.shields.io/badge/built_with-sern-pink?labelColor=%230C3478&color=%23ed5087&link=https%3A%2F%2Fsern.dev">
 
 ## 🤖 Bots Using sern 
 - [Community Bot](https://github.com/sern-handler/sern-community) - The community bot for our [Discord server](https://sern.dev/discord).
@@ -59,14 +53,10 @@ export default commandModule({
 - [SmokinWeed 💨](https://github.com/Peter-MJ-Parker/sern-bud) - A fun bot for a small, but growing server.
 - [Man Nomic](https://github.com/jacoobes/man-nomic) - A simple information bot to provide information to the nomic-ai Discord community.
 - [Linear-Discord](https://github.com/sern-handler/linear-discord) - Display and manage a linear dashboard.
-- [ZenithBot](https://github.com/CodeCraftersHaven/ZenithBot) - A versatile bot coded in TypeScript, designed to enhance server management and user interaction through its robust features.
-
 ## 💻 CLI
 
 It is **highly encouraged** to use the [command line interface](https://github.com/sern-handler/cli) for your project. Don't forget to view it.
 
-
-
 ## 🔗 Links
 
 - [Official Documentation and Guide](https://sern.dev)

package.json

@@ -1,7 +1,7 @@
 {
     "name": "@sern/handler",
     "packageManager": "yarn@3.5.0",
-    "version": "4.2.3",
+    "version": "4.2.1",
     "description": "A complete, customizable, typesafe, & reactive framework for discord bots.",
     "main": "./dist/index.js",
     "module": "./dist/index.js",
@@ -20,7 +20,6 @@
         "prepare": "tsc",
         "pretty": "prettier --write .",
         "tdd": "vitest",
-        "benchmark": "vitest bench",
         "test": "vitest --run",
         "analyze-imports": "npx depcruise src --include-only \"^src\" --output-type dot | dot -T svg > dependency-graph.svg"
     },
@@ -36,7 +35,7 @@
     "author": "SernDevs",
     "license": "MIT",
     "dependencies": {
-        "@sern/ioc": "^1.1.2",
+        "@sern/ioc": "^1.1.0",
         "callsites": "^3.1.0",
         "cron": "^3.1.7",
         "deepmerge": "^4.3.1"
@@ -47,7 +46,7 @@
         "@types/node-cron": "^3.0.11",
         "@typescript-eslint/eslint-plugin": "5.58.0",
         "@typescript-eslint/parser": "5.59.1",
-        "discord.js": "^14.14.1",
+        "discord.js": "^14.15.3",
         "eslint": "8.39.0",
         "typescript": "5.0.2",
         "vitest": "^1.6.0"

src/core/functions.ts

@@ -6,12 +6,12 @@ import type {
     MessageContextMenuCommandInteraction,
     ModalSubmitInteraction,
     UserContextMenuCommandInteraction,
-    AutocompleteInteraction,
+    AutocompleteInteraction
 } from 'discord.js';
 import { ApplicationCommandOptionType, InteractionType } from 'discord.js';
 import { PluginType } from './structures/enums';
+import assert from 'assert';
 import type { Payload, UnpackedDependencies } from '../types/utility';
-import path from 'node:path'
 
 export const createSDT = (module: Module, deps: UnpackedDependencies, params: string|undefined) => {
     return {
@@ -57,32 +57,52 @@ export function partitionPlugins<T,V>
     return [controlPlugins, initPlugins] as [T[], V[]];
 }
 
-export const createLookupTable = (options: SernOptionsData[]): Map<string, SernAutocompleteData> => {
-    const table = new Map<string, SernAutocompleteData>();
-    _createLookupTable(table, options, "<parent>");
-    return table;
-}
-
-const _createLookupTable = (table: Map<string, SernAutocompleteData>, options: SernOptionsData[], parent: string) => {
-    for (const opt of options) {
-        const name = path.posix.join(parent, opt.name)
-        switch(opt.type) {
+/**
+ * Uses an iterative DFS to check if an autocomplete node exists on the option tree
+ * @param iAutocomplete
+ * @param options
+ */
+export function treeSearch(
+    iAutocomplete: AutocompleteInteraction,
+    options: SernOptionsData[] | undefined,
+): SernAutocompleteData & { parent?: string } | undefined {
+    if (options === undefined) return undefined;
+    //clone to prevent mutation of original command module
+    const _options = options.map(a => ({ ...a }));
+    const subcommands = new Set();
+    while (_options.length > 0) {
+        const cur = _options.pop()!;
+        switch (cur.type) {
             case ApplicationCommandOptionType.Subcommand: {
-                    _createLookupTable(table, opt.options ?? [], name);
-            } break;
+                    subcommands.add(cur.name);
+                    for (const option of cur.options ?? []) _options.push(option);
+                } break;
             case ApplicationCommandOptionType.SubcommandGroup: {
-                    _createLookupTable(table, opt.options ?? [], name);
-            } break;
+                    for (const command of cur.options ?? []) _options.push(command);
+                } break;
             default: {
-                if(Reflect.get(opt, 'autocomplete') === true) {
-                    table.set(name, opt as SernAutocompleteData)
+                if ('autocomplete' in cur && cur.autocomplete) {
+                    const choice = iAutocomplete.options.getFocused(true);
+                    assert( 'command' in cur, 'No `command` property found for option ' + cur.name);
+                    if (subcommands.size > 0) {
+                        const parent = iAutocomplete.options.getSubcommand();
+                        const parentAndOptionMatches =
+                            subcommands.has(parent) && cur.name === choice.name;
+                        if (parentAndOptionMatches) {
+                            return { ...cur, parent };
+                        }
+                    } else {
+                        if (cur.name === choice.name) {
+                            return { ...cur, parent: undefined };
+                        }
+                    }
                 }
             } break;
         }
-    } 
-
+    }
 }
 
+
 interface InteractionTypable {
     type: InteractionType;
 }

src/handlers/interaction.ts

@@ -1,11 +1,10 @@
-import type { Module, SernAutocompleteData } from '../types/core-modules'
+import type { Module } from '../types/core-modules'
 import {  callPlugins, executeModule } from './event-utils';
 import { SernError } from '../core/structures/enums'
-import { createSDT, isAutocomplete, isCommand, isContextCommand, isMessageComponent, isModal, resultPayload } from '../core/functions'
+import { createSDT, isAutocomplete, isCommand, isContextCommand, isMessageComponent, isModal, resultPayload, treeSearch } from '../core/functions'
 import type { UnpackedDependencies } from '../types/utility';
 import * as Id from '../core/id'
 import { Context } from '../core/structures/context';
-import path from 'node:path';
 
 
 
@@ -32,15 +31,10 @@ export function interactionHandler(deps: UnpackedDependencies, defaultPrefix?: s
         let payload;
         // handles autocomplete
         if(isAutocomplete(event)) {
-            const lookupTable = module.locals['@sern/lookup-table'] as Map<string, SernAutocompleteData>
-            const subCommandGroup = event.options.getSubcommandGroup() ?? "",
-                  subCommand = event.options.getSubcommand() ?? "",
-                  option = event.options.getFocused(true),
-                  fullPath = path.posix.join("<parent>", subCommandGroup, subCommand, option.name)
-                  
-            const resolvedModule = (lookupTable.get(fullPath)!.command) as Module
-            payload= { module: resolvedModule , //autocomplete is not a true "module" warning cast!
-                       args: [event, createSDT(module, deps, params)] };
+            //@ts-ignore stfu
+            const { command } = treeSearch(event, module.options);
+            payload= { module: command as Module, //autocomplete is not a true "module" warning cast!
+                       args: [event, createSDT(command, deps, params)] };
             // either CommandTypes Slash |  ContextMessage | ContextUesr
         } else if(isCommand(event)) {
             const sdt = createSDT(module, deps, params)

src/handlers/ready.ts

@@ -1,11 +1,10 @@
 import * as Files from '../core/module-loading'
 import { once } from 'node:events';
-import { createLookupTable, resultPayload } from '../core/functions';
+import { resultPayload } from '../core/functions';
 import { CommandType } from '../core/structures/enums';
-import { Module, SernOptionsData } from '../types/core-modules';
+import { Module } from '../types/core-modules';
 import type { UnpackedDependencies, Wrapper } from '../types/utility';
 import { callInitPlugins } from './event-utils';
-import { SernAutocompleteData } from '..';
 
 export default async function(dirs: string | string[], deps : UnpackedDependencies) {
     const { '@sern/client': client,
@@ -29,12 +28,6 @@ export default async function(dirs: string | string[], deps : UnpackedDependenci
                 throw Error(`Found ${module.name} at ${module.meta.absPath}, which has incorrect \`type\``);
             }
             const resultModule = await callInitPlugins(module, deps, true);
-
-            if(module.type === CommandType.Both || module.type === CommandType.Slash) {
-               const options  = (Reflect.get(module, 'options') ?? []) as SernOptionsData[];
-               const lookupTable = createLookupTable(options)
-               module.locals['@sern/lookup-table'] = lookupTable;
-            }
             // FREEZE! no more writing!!
             commands.set(resultModule.meta.id, Object.freeze(resultModule));
             sEmitter.emit('module.register', resultPayload('success', resultModule));

test/autocomp.bench.ts

@@ -1,84 +0,0 @@
-import { describe } from 'node:test'
-import { bench } from 'vitest'
-import { SernAutocompleteData, SernOptionsData } from '../src'
-import { createRandomChoice } from './setup/util'
-import { ApplicationCommandOptionType, AutocompleteFocusedOption, AutocompleteInteraction } from 'discord.js'
-import { createLookupTable } from '../src/core/functions'
-import assert from 'node:assert'
-
-/**
- * Uses an iterative DFS to check if an autocomplete node exists on the option tree
- * This is the old internal method that sern used to resolve autocomplete
- * @param iAutocomplete
- * @param options
- */
-function treeSearch(
-    choice: AutocompleteFocusedOption,
-    parent: string|undefined,
-    options: SernOptionsData[] | undefined,
-): SernAutocompleteData & { parent?: string } | undefined {
-    if (options === undefined) return undefined;
-    //clone to prevent mutation of original command module
-    const _options = options.map(a => ({ ...a }));
-    const subcommands = new Set();
-    while (_options.length > 0) {
-        const cur = _options.pop()!;
-        switch (cur.type) {
-            case ApplicationCommandOptionType.Subcommand: {
-                    subcommands.add(cur.name);
-                    for (const option of cur.options ?? []) _options.push(option);
-                } break;
-            case ApplicationCommandOptionType.SubcommandGroup: {
-                    for (const command of cur.options ?? []) _options.push(command);
-                } break;
-            default: {
-                if ('autocomplete' in cur && cur.autocomplete) {
-                    assert( 'command' in cur, 'No `command` property found for option ' + cur.name);
-                    if (subcommands.size > 0) {
-                        const parentAndOptionMatches =
-                            subcommands.has(parent) && cur.name === choice.name;
-                        if (parentAndOptionMatches) {
-                            return { ...cur, parent };
-                        }
-                    } else {
-                        if (cur.name === choice.name) {
-                            return { ...cur, parent: undefined };
-                        }
-                    }
-                }
-            } break;
-        }
-    }
-}
-
-const options: SernOptionsData[] = [
-    createRandomChoice(),
-    createRandomChoice(),
-    createRandomChoice(),
-    {
-        type: ApplicationCommandOptionType.String,
-        name: 'autocomplete',
-        description: 'here',
-        autocomplete: true,
-        command: { onEvent: [], execute: () => {} },
-    },
-]
-
-
-const table =  createLookupTable(options)
-
-
-describe('autocomplete lookup', () => {
-
-    bench('lookup table', () => {
-         table.get('<parent>/autocomplete')
-    }, { time: 500 })   
-
-
-    bench('naive treeSearch', () => {
-        treeSearch({ focused: true, 
-                     name: 'autocomplete',
-                     value: 'autocomplete',
-                     type: ApplicationCommandOptionType.String }, undefined, options)
-    }, { time: 500 })
-})

test/core/functions.test.ts

@@ -1,17 +1,29 @@
 //@ts-nocheck
+
 import { afterEach, describe, expect, it, vi } from 'vitest';
 import { PluginType, SernOptionsData, controller } from '../../src/index';
-import { createLookupTable, partitionPlugins, treeSearch } from '../../src/core/functions';
+import { partitionPlugins, treeSearch } from '../../src/core/functions';
 import { faker } from '@faker-js/faker';
 import { ApplicationCommandOptionType, AutocompleteInteraction } from 'discord.js';
-import { createRandomChoice, createRandomPlugins } from '../setup/util';
 
 describe('functions', () => {
     afterEach(() => {
         vi.clearAllMocks();
     });
-    
-    
+    function createRandomPlugins(len: number) {
+        const random = () => Math.floor(Math.random() * 2) + 1; // 1 or 2, plugin enum
+        return Array.from({ length: len }, () => ({
+            type: random(),
+            execute: () => (random() === 1 ? controller.next() : controller.stop()),
+        }));
+    }
+    function createRandomChoice() {
+        return {
+            type: faker.number.int({ min: 1, max: 11 }),
+            name: faker.word.noun(),
+            description: faker.word.adjective(),
+        };
+    }
     it('should partition plugins correctly', () => {
         const plugins = createRandomPlugins(100);
         const [onEvent, init] = partitionPlugins(plugins);
@@ -20,34 +32,127 @@ describe('functions', () => {
         for (const el of init) expect(el.type).to.equal(PluginType.Init);
     });
 
-    describe('autocomplete', ( ) => {
-        
-        it('should tree search options tree depth 1', () => {
+    it('should tree search options tree depth 1', () => {
+        //@ts-expect-error mocking
+        let autocmpInteraction = new AutocompleteInteraction('autocomplete');
+        const options: SernOptionsData[] = [
+            createRandomChoice(),
+            createRandomChoice(),
+            createRandomChoice(),
+            {
+                type: ApplicationCommandOptionType.String,
+                name: 'autocomplete',
+                description: 'here',
+                autocomplete: true,
+                command: { onEvent: [], execute: vi.fn() },
+            },
+        ];
+        autocmpInteraction.options.getFocused.mockReturnValue({
+            name: 'autocomplete',
+            value: faker.string.alpha(),
+            focused: true,
+        });
+        const result = treeSearch(autocmpInteraction, options);
+        expect(result == undefined).to.be.false;
+        expect(result.name).to.be.eq('autocomplete');
+        expect(result.command).to.be.not.undefined;
+    }),
+        it('should tree search depth 2', () => {
+            //@ts-expect-error mocking
+            let autocmpInteraction = new AutocompleteInteraction('nested');
+            const subcommandName = faker.string.alpha();
             const options: SernOptionsData[] = [
-                createRandomChoice(),
                 {
-                    type: ApplicationCommandOptionType.String,
-                    name: 'autocomplete',
-                    description: 'here',
-                    autocomplete: true,
-                    command: { onEvent: [], execute: vi.fn() },
+                    type: ApplicationCommandOptionType.Subcommand,
+                    name: subcommandName,
+                    description: faker.string.alpha(),
+                    options: [
+                        createRandomChoice(),
+                        createRandomChoice(),
+                        createRandomChoice(),
+                        {
+                            type: ApplicationCommandOptionType.String,
+                            name: 'nested',
+                            description: faker.string.alpha(),
+                            autocomplete: true,
+                            command: {
+                                onEvent: [],
+                                execute: () => {},
+                            },
+                        },
+                    ],
                 },
             ];
-            const table = createLookupTable(options)
-            const result = table.get('<parent>/autocomplete')
+            autocmpInteraction.options.getSubcommand.mockReturnValue(subcommandName);
+            autocmpInteraction.options.getFocused.mockReturnValue({
+                name: 'nested',
+                value: faker.string.alpha(),
+                focused: true,
+            });
+            const result = treeSearch(autocmpInteraction, options);
             expect(result == undefined).to.be.false;
-            expect(result.name).to.be.eq('autocomplete');
+            expect(result.name).to.be.eq('nested');
             expect(result.command).to.be.not.undefined;
-        }),
-            it('should tree search depth 2', () => {
-                const subcommandName = faker.string.alpha();
-                const options: SernOptionsData[] = [
+        });
+
+    it('should tree search depth n > 2', () => {
+        //@ts-expect-error mocking
+        let autocmpInteraction = new AutocompleteInteraction('nested');
+        const subcommandName = faker.string.alpha();
+        const options: SernOptionsData[] = [
+            {
+                type: ApplicationCommandOptionType.SubcommandGroup,
+                name: faker.string.alpha(),
+                description: faker.string.alpha(),
+                options: [
                     {
                         type: ApplicationCommandOptionType.Subcommand,
                         name: subcommandName,
                         description: faker.string.alpha(),
                         options: [
                             createRandomChoice(),
+                            createRandomChoice(),
+                            {
+                                type: ApplicationCommandOptionType.String,
+                                name: 'nested',
+                                description: faker.string.alpha(),
+                                autocomplete: true,
+                                command: {
+                                    onEvent: [],
+                                    execute: () => {},
+                                },
+                            },
+                            createRandomChoice(),
+                        ],
+                    },
+                ],
+            },
+        ];
+        autocmpInteraction.options.getSubcommand.mockReturnValue(subcommandName);
+        autocmpInteraction.options.getFocused.mockReturnValue({
+            name: 'nested',
+            value: faker.string.alpha(),
+            focused: true,
+        });
+        const result = treeSearch(autocmpInteraction, options);
+        expect(result == undefined).to.be.false;
+        expect(result.name).to.be.eq('nested');
+        expect(result.command).to.be.not.undefined;
+    });
+    it('should correctly resolve suboption of the same name given two subcommands ', () => {
+        let autocmpInteraction = new AutocompleteInteraction('nested');
+        const subcommandName = faker.string.alpha();
+        const options: SernOptionsData[] = [
+            {
+                type: ApplicationCommandOptionType.SubcommandGroup,
+                name: faker.string.alpha(),
+                description: faker.string.alpha(),
+                options: [
+                    {
+                        type: ApplicationCommandOptionType.Subcommand,
+                        name: subcommandName,
+                        description: faker.string.alpha(),
+                        options: [
                             createRandomChoice(),
                             createRandomChoice(),
                             {
@@ -62,233 +167,173 @@ describe('functions', () => {
                             },
                         ],
                     },
-                ];
-                const table = createLookupTable(options)
-                const result = table.get(`<parent>/${subcommandName}/nested`)
-                expect(result == undefined).to.be.false;
-                expect(result.name).to.be.eq('nested');
-                expect(result.command).to.be.not.undefined;
+                    {
+                        type: ApplicationCommandOptionType.Subcommand,
+                        name: subcommandName + 'a',
+                        description: faker.string.alpha(),
+                        options: [
+                            createRandomChoice(),
+                            {
+                                type: ApplicationCommandOptionType.String,
+                                name: 'nested',
+                                description: faker.string.alpha(),
+                                autocomplete: true,
+                                command: {
+                                    onEvent: [],
+                                    execute: () => {},
+                                },
+                            },
+                        ],
+                    },
+                ],
+            },
+        ];
+        autocmpInteraction.options.getSubcommand.mockReturnValue(subcommandName);
+        autocmpInteraction.options.getFocused.mockReturnValue({
+            name: 'nested',
+            value: faker.string.alpha(),
+            focused: true,
+        });
+        const result = treeSearch(autocmpInteraction, options);
+        expect(result).toBeTruthy();
+        expect(result.name).to.be.eq('nested');
+        expect(result.command).to.be.not.undefined;
+    });
+    it('two subcommands with an option of the same name', () => {
+        let autocmpInteraction = new AutocompleteInteraction('nested');
+        const subcommandName = faker.string.alpha();
+        const options: SernOptionsData[] = [
+            {
+                type: ApplicationCommandOptionType.SubcommandGroup,
+                name: faker.string.alpha(),
+                description: faker.string.alpha(),
+                options: [
+                    {
+                        type: ApplicationCommandOptionType.Subcommand,
+                        name: subcommandName,
+                        description: faker.string.alpha(),
+                        options: [
+                            createRandomChoice(),
+                            createRandomChoice(),
+                            {
+                                type: ApplicationCommandOptionType.String,
+                                name: 'nested',
+                                description: faker.string.alpha(),
+                                autocomplete: true,
+                                command: {
+                                    onEvent: [],
+                                    execute: () => {},
+                                },
+                            },
+                        ],
+                    },
+                    {
+                        type: ApplicationCommandOptionType.Subcommand,
+                        name: subcommandName + 'a',
+                        description: faker.string.alpha(),
+                        options: [
+                            createRandomChoice(),
+                            {
+                                type: ApplicationCommandOptionType.String,
+                                name: 'nested',
+                                description: faker.string.alpha(),
+                                autocomplete: true,
+                                command: {
+                                    onEvent: [],
+                                    execute: () => {},
+                                },
+                            },
+                        ],
+                    },
+                ],
+            },
+        ];
+        autocmpInteraction.options.getSubcommand.mockReturnValue(subcommandName);
+        autocmpInteraction.options.getFocused.mockReturnValue({
+            name: 'nested',
+            value: faker.string.alpha(),
+            focused: true,
+        });
+        const result = treeSearch(autocmpInteraction, options);
+        expect(result).toBeTruthy();
+        expect(result.name).to.be.eq('nested');
+        expect(result.command).to.be.not.undefined;
+
+        let autocmpInteraction2 = new AutocompleteInteraction('nested');
+        autocmpInteraction2.options.getSubcommand.mockReturnValue(subcommandName + 'a');
+        autocmpInteraction2.options.getFocused.mockReturnValue({
+            name: 'nested',
+            value: faker.string.alpha(),
+            focused: true,
+        });
+        const result2 = treeSearch(autocmpInteraction2, options);
+        expect(result2).toBeTruthy();
+        expect(result2?.name).toEqual('nested');
+    });
+
+    it('simulates autocomplete typing and resolution', () => {
+        const subcommandName = faker.string.alpha();
+        const optionName = faker.word.noun();
+        const options: SernOptionsData[] = [
+            {
+                type: ApplicationCommandOptionType.SubcommandGroup,
+                name: faker.string.alpha(),
+                description: faker.string.alpha(),
+                options: [
+                    {
+                        type: ApplicationCommandOptionType.Subcommand,
+                        name: subcommandName,
+                        description: faker.string.alpha(),
+                        options: [
+                            createRandomChoice(),
+                            createRandomChoice(),
+                            {
+                                type: ApplicationCommandOptionType.String,
+                                name: optionName,
+                                description: faker.string.alpha(),
+                                autocomplete: true,
+                                command: {
+                                    onEvent: [],
+                                    execute: vi.fn(),
+                                },
+                            },
+                        ],
+                    },
+                    {
+                        type: ApplicationCommandOptionType.Subcommand,
+                        name: subcommandName + 'a',
+                        description: faker.string.alpha(),
+                        options: [
+                            createRandomChoice(),
+                            {
+                                type: ApplicationCommandOptionType.String,
+                                name: optionName,
+                                description: faker.string.alpha(),
+                                autocomplete: true,
+                                command: {
+                                    onEvent: [],
+                                    execute: vi.fn(),
+                                },
+                            },
+                        ],
+                    },
+                ],
+            },
+        ];
+        let accumulator = '';
+        let result: unknown;
+        for (const char of optionName) {
+            accumulator += char;
+
+            const autocomplete = new AutocompleteInteraction(accumulator);
+            autocomplete.options.getSubcommand.mockReturnValue(subcommandName);
+            autocomplete.options.getFocused.mockReturnValue({
+                name: accumulator,
+                value: faker.string.alpha(),
+                focused: true,
             });
-
-        it('should tree search depth n > 2', () => {
-            const subgroupName = faker.string.alpha()
-            const subcommandName = faker.string.alpha();
-            const options: SernOptionsData[] = [
-                {
-                    type: ApplicationCommandOptionType.SubcommandGroup,
-                    name: subgroupName,
-                    description: faker.string.alpha(),
-                    options: [
-                        {
-                            type: ApplicationCommandOptionType.Subcommand,
-                            name: subcommandName,
-                            description: faker.string.alpha(),
-                            options: [
-                                createRandomChoice(),
-                                createRandomChoice(),
-                                {
-                                    type: ApplicationCommandOptionType.String,
-                                    name: 'nested',
-                                    description: faker.string.alpha(),
-                                    autocomplete: true,
-                                    command: {
-                                        onEvent: [],
-                                        execute: () => {},
-                                    },
-                                },
-                                createRandomChoice(),
-                            ],
-                        },
-                    ],
-                },
-            ];
-            const table = createLookupTable(options)
-            const result = table.get(`<parent>/${subgroupName}/${subcommandName}/nested`)
-            expect(result == undefined).to.be.false;
-            expect(result.name).to.be.eq('nested');
-            expect(result.command).to.be.not.undefined;
-        });
-
-        it('should correctly resolve suboption of the same name given two subcommands ', () => {
-            const subcommandName = faker.string.alpha();
-            const groupname = faker.string.alpha()
-            const options: SernOptionsData[] = [
-                {
-                    type: ApplicationCommandOptionType.SubcommandGroup,
-                    name: groupname,
-                    description: faker.string.alpha(),
-                    options: [
-                        {
-                            type: ApplicationCommandOptionType.Subcommand,
-                            name: subcommandName,
-                            description: faker.string.alpha(),
-                            options: [
-                                createRandomChoice(),
-                                createRandomChoice(),
-                                {
-                                    type: ApplicationCommandOptionType.String,
-                                    name: 'nested',
-                                    description: faker.string.alpha(),
-                                    autocomplete: true,
-                                    command: {
-                                        onEvent: [],
-                                        execute: () => {},
-                                    },
-                                },
-                            ],
-                        },
-                        {
-                            type: ApplicationCommandOptionType.Subcommand,
-                            name: subcommandName + 'a',
-                            description: faker.string.alpha(),
-                            options: [
-                                createRandomChoice(),
-                                {
-                                    type: ApplicationCommandOptionType.String,
-                                    name: 'nested',
-                                    description: faker.string.alpha(),
-                                    autocomplete: true,
-                                    command: {
-                                        onEvent: [],
-                                        execute: () => {},
-                                    },
-                                },
-                            ],
-                        },
-                    ],
-                },
-            ];
-            const table = createLookupTable(options)
-            const result = table.get(`<parent>/${groupname}/${subcommandName}/nested`);
-            expect(result).toBeTruthy();
-            expect(result.name).to.be.eq('nested');
-            expect(result.command).to.be.not.undefined;
-        });
-        it('two subcommands with an option of the same name', () => {
-            const groupName = faker.string.alpha()
-            const subcommandName = faker.string.alpha();
-            const options: SernOptionsData[] = [
-                {
-                    type: ApplicationCommandOptionType.SubcommandGroup,
-                    name: groupName,
-                    description: faker.string.alpha(),
-                    options: [
-                        {
-                            type: ApplicationCommandOptionType.Subcommand,
-                            name: subcommandName,
-                            description: faker.string.alpha(),
-                            options: [
-                                createRandomChoice(),
-                                createRandomChoice(),
-                                {
-                                    type: ApplicationCommandOptionType.String,
-                                    name: 'nested',
-                                    description: faker.string.alpha(),
-                                    autocomplete: true,
-                                    command: {
-                                        onEvent: [],
-                                        execute: () => {},
-                                    },
-                                },
-                            ],
-                        },
-                        {
-                            type: ApplicationCommandOptionType.Subcommand,
-                            name: subcommandName + 'anothera',
-                            description: faker.string.alpha(),
-                            options: [
-                                createRandomChoice(),
-                                {
-                                    type: ApplicationCommandOptionType.String,
-                                    name: 'nested',
-                                    description: faker.string.alpha(),
-                                    autocomplete: true,
-                                    command: {
-                                        onEvent: [],
-                                        execute: () => {},
-                                    },
-                                },
-                            ],
-                        },
-                    ],
-                },
-            ];
-            
-            const table = createLookupTable(options)
-            const result = table.get(`<parent>/${groupName}/${subcommandName}/nested`);
-            expect(result).toBeTruthy();
-            expect(result.name).to.be.eq('nested');
-            expect(result.command).to.be.not.undefined;
-
-
-        });
-
-        it('simulates autocomplete typing and resolution', () => {
-            const subcommandGroupName = faker.string.alpha()
-            const subcommandName = faker.string.alpha();
-            const optionName = faker.word.noun();
-            const options: SernOptionsData[] = [
-                {
-                    type: ApplicationCommandOptionType.SubcommandGroup,
-                    name: subcommandGroupName,
-                    description: faker.string.alpha(),
-                    options: [
-                        {
-                            type: ApplicationCommandOptionType.Subcommand,
-                            name: subcommandName,
-                            description: faker.string.alpha(),
-                            options: [
-                                createRandomChoice(),
-                                createRandomChoice(),
-                                {
-                                    type: ApplicationCommandOptionType.String,
-                                    name: optionName,
-                                    description: faker.string.alpha(),
-                                    autocomplete: true,
-                                    command: {
-                                        onEvent: [],
-                                        execute: vi.fn(),
-                                    },
-                                },
-                            ],
-                        },
-                        {
-                            type: ApplicationCommandOptionType.Subcommand,
-                            name: subcommandName + 'a',
-                            description: faker.string.alpha(),
-                            options: [
-                                createRandomChoice(),
-                                {
-                                    type: ApplicationCommandOptionType.String,
-                                    name: optionName,
-                                    description: faker.string.alpha(),
-                                    autocomplete: true,
-                                    command: {
-                                        onEvent: [],
-                                        execute: vi.fn(),
-                                    },
-                                },
-                            ],
-                        },
-                    ],
-                },
-            ];
-            let accumulator = '';
-            let result: unknown;
-            const table = createLookupTable(options)
-            for (const char of optionName) {
-                accumulator += char;
-
-                const focusedValue = {
-                    name: accumulator,
-                    value: faker.string.alpha(),
-                    focused: true,
-                };
-                result = table.get(`<parent>/${subcommandGroupName}/${subcommandName}/${focusedValue.name}` );
-            }
-            expect(result).toBeTruthy();
-        });
-    })
-
-
+            result = treeSearch(autocomplete, options);
+        }
+        expect(result).toBeTruthy();
+    });
 });

test/setup/util.ts

@@ -28,21 +28,3 @@ export function createRandomModule(plugins: any[]): Processed<Module> {
         execute: vi.fn(),
     };
 }
-
-
-export function createRandomChoice() {
-        return {
-            type: faker.number.int({ min: 1, max: 11 }),
-            name: faker.word.noun(),
-            description: faker.word.adjective(),
-        };
-    }
-
-
-export function createRandomPlugins(len: number) {
-        const random = () => Math.floor(Math.random() * 2) + 1; // 1 or 2, plugin enum
-        return Array.from({ length: len }, () => ({
-            type: random(),
-            execute: () => (random() === 1 ? controller.next() : controller.stop()),
-        }));
-    }