chore(main): release 3.3.2 (#352)

* chore(main): release 3.3.2

* Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jacob Nguyen <76754747+jacoobes@users.noreply.github.com>

.github/workflows/continuous-integration.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
 
       - name: Set up Node.js
-        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
+        uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
         with:
           node-version: 17
 

.github/workflows/npm-publish.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
-      - uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3
+      - uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
         with:
           node-version: 17
       - run: yarn --immutable

.github/workflows/test.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
     - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3
+      uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'npm'

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [3.3.2](https://github.com/sern-handler/handler/compare/v3.3.1...v3.3.2) (2024-01-08)
+
+
+### Bug Fixes
+
+* presence feature not working on cjs applications ([#351](https://github.com/sern-handler/handler/issues/351)) ([4f23871](https://github.com/sern-handler/handler/commit/4f2387119acfde036d0d1626553e9050f55627d1))
+
+## [3.3.1](https://github.com/sern-handler/handler/compare/v3.3.0...v3.3.1) (2024-01-07)
+
+
+### Bug Fixes
+
+* crashing when slash command is used as text command ([#349](https://github.com/sern-handler/handler/issues/349)) ([a359f73](https://github.com/sern-handler/handler/commit/a359f73fa24127a4964d411c8c1c0dfea5edc0f1))
+
+
+### Reverts
+
+* the last commit ([655bb8d](https://github.com/sern-handler/handler/commit/655bb8d35815fe0ce9797d8b169310a07b284ae0))
+
 ## [3.3.0](https://github.com/sern-handler/handler/compare/v3.2.1...v3.3.0) (2023-12-27)
 
 

fortnite

@@ -0,0 +1 @@
+

package.json

@@ -1,7 +1,7 @@
 {
     "name": "@sern/handler",
     "packageManager": "yarn@3.5.0",
-    "version": "3.3.0",
+    "version": "3.3.2",
     "description": "A complete, customizable, typesafe, & reactive framework for discord bots.",
     "main": "./dist/index.js",
     "module": "./dist/index.mjs",

src/core/create-plugins.ts

@@ -1,6 +1,7 @@
 import { CommandType, EventType, PluginType } from './structures';
 import type { Plugin, PluginResult, EventArgs, CommandArgs } from '../types/core-plugin';
 import type { ClientEvents } from 'discord.js';
+import { err, ok } from './functions';
 
 export function makePlugin<V extends unknown[]>(
     type: PluginType,
@@ -60,3 +61,12 @@ export function DiscordEventControlPlugin<T extends keyof ClientEvents>(
 ) {
     return makePlugin(PluginType.Control, execute);
 }
+
+/**
+ * @since 1.0.0
+ * The object passed into every plugin to control a command's behavior
+ */
+export const controller = {
+    next: ok,
+    stop: err,
+};

src/core/functions.ts

@@ -61,7 +61,7 @@ export function treeSearch(
                         const choice = iAutocomplete.options.getFocused(true);
                         assert(
                             'command' in cur,
-                            'No command property found for autocomplete option',
+                            'No `command` property found for autocomplete option',
                         );
                         if (subcommands.size > 0) {
                             const parent = iAutocomplete.options.getSubcommand();

src/core/id.ts

@@ -4,20 +4,20 @@ import { CommandType, EventType } from './structures';
 /**
  * Construct unique ID for a given interaction object.
  * @param event The interaction object for which to create an ID.
- * @returns A unique string ID based on the type and properties of the interaction object.
+ * @returns An array of unique string IDs based on the type and properties of the interaction object.
  */
 export function reconstruct<T extends Interaction>(event: T) {
     switch (event.type) {
         case InteractionType.MessageComponent: {
-            return `${event.customId}_C${event.componentType}`;
+            return [`${event.customId}_C${event.componentType}`];
         }
         case InteractionType.ApplicationCommand:
         case InteractionType.ApplicationCommandAutocomplete: {
-            return `${event.commandName}_A${event.commandType}`;
+            return [`${event.commandName}_A${event.commandType}`, `${event.commandName}_B`];
         }
         //Modal interactions are classified as components for sern
         case InteractionType.ModalSubmit: {
-            return `${event.customId}_C1`;
+            return [`${event.customId}_M`];
         }
     }
 }
@@ -27,29 +27,28 @@ export function reconstruct<T extends Interaction>(event: T) {
  */
 const appBitField = 0b000000001111;
 
-// Each index represents the exponent of a CommandType.
-// Every CommandType is a power of two.
-export const CommandTypeDiscordApi = [
-    1, // CommandType.Text
-    ApplicationCommandType.ChatInput,
-    ApplicationCommandType.User,
-    ApplicationCommandType.Message,
-    ComponentType.Button,
-    ComponentType.StringSelect,
-    1, //  CommandType.Modal
-    ComponentType.UserSelect,
-    ComponentType.RoleSelect,
-    ComponentType.MentionableSelect,
-    ComponentType.ChannelSelect,
-];
+
+const TypeMap = new Map<number, number>([
+    [CommandType.Text, 0],
+    [CommandType.Both, 0],
+    [CommandType.Slash, ApplicationCommandType.ChatInput],
+    [CommandType.CtxUser, ApplicationCommandType.User],
+    [CommandType.CtxMsg, ApplicationCommandType.Message],
+    [CommandType.Button, ComponentType.Button],
+    [CommandType.Modal, InteractionType.ModalSubmit],
+    [CommandType.StringSelect, ComponentType.StringSelect],
+    [CommandType.UserSelect, ComponentType.UserSelect],
+    [CommandType.MentionableSelect, ComponentType.MentionableSelect],
+    [CommandType.RoleSelect, ComponentType.RoleSelect],
+    [CommandType.ChannelSelect, ComponentType.ChannelSelect]]);
+
 /*
  * Generates a number based on CommandType.
  * This corresponds to an ApplicationCommandType or ComponentType
  * TextCommands are 0 as they aren't either or.
  */
 function apiType(t: CommandType | EventType) {
-    if (t === CommandType.Both || t === CommandType.Modal) return 1;
-    return CommandTypeDiscordApi[Math.log2(t)];
+    return TypeMap.get(t)!;
 }
 
 /*
@@ -58,6 +57,18 @@ function apiType(t: CommandType | EventType) {
  * Then, another number generated by apiType function is appended
  */
 export function create(name: string, type: CommandType | EventType) {
+    if(type == CommandType.Text) {
+        return `${name}_T`;
+    }
+    if(type == CommandType.Both) {
+        return `${name}_B`;
+    }
+    if(type == CommandType.Modal) {
+        return `${name}_M`;
+    }
     const am = (appBitField & type) !== 0 ? 'A' : 'C';
-    return name + '_' + am + apiType(type);
+    return `${name}_${am}${apiType(type)}`
 }
+
+
+

src/core/ioc/base.ts

@@ -5,6 +5,7 @@ import { CoreContainer } from './container';
 import { Result } from 'ts-results-es'
 import { DefaultServices } from '../_internal';
 import { AnyFunction } from '../../types/utility';
+import type { Logging } from '../contracts/logging';
 //SIDE EFFECT: GLOBAL DI
 let containerSubject: CoreContainer<Partial<Dependencies>>;
 
@@ -22,6 +23,12 @@ export function useContainerRaw() {
     return containerSubject;
 }
 
+export function disposeAll(logger: Logging|undefined) {
+    containerSubject
+        ?.disposeAll()
+        .then(() => logger?.info({ message: 'Cleaning container and crashing' }));
+}
+
 const dependencyBuilder = (container: any, excluded: string[]) => {
     type Insertable = 
         | ((container: CoreContainer<Dependencies>) => unknown )
@@ -82,16 +89,16 @@ export const insertLogger = (containerSubject: CoreContainer<any>) => {
 }
 export async function makeDependencies<const T extends Dependencies>
 (conf: ValidDependencyConfig) {
-    //Until there are more optional dependencies, just check if the logger exists
-    //SIDE EFFECT
     containerSubject = new CoreContainer();
     if(typeof conf === 'function') {
         const excluded: string[] = [];
         conf(dependencyBuilder(containerSubject, excluded));
+
         if(!excluded.includes('@sern/logger') 
            && !containerSubject.getTokens()['@sern/logger']) {
             insertLogger(containerSubject);
         }
+
         containerSubject.ready();
     } else {
         composeRoot(containerSubject, conf);

src/core/ioc/container.ts

@@ -22,19 +22,18 @@ export class CoreContainer<T extends Partial<Dependencies>> extends Container<T,
 
         (this as Container<{}, {}>)
             .add({ '@sern/errors': () => new DefaultServices.DefaultErrorHandling(),
-                   '@sern/emitter': () => new SernEmitter(),
-                   '@sern/store': () => new ModuleStore() })
+                   '@sern/emitter': () => new SernEmitter,
+                   '@sern/store': () => new ModuleStore })
             .add(ctx => {
-                return {
-                    '@sern/modules': () =>
-                        new DefaultServices.DefaultModuleManager(ctx['@sern/store']),
-                };
+                return { '@sern/modules': () =>
+                        new DefaultServices.DefaultModuleManager(ctx['@sern/store']) };
             });
     }
 
     isReady() {
         return this.ready$.closed;
     }
+
     override async disposeAll() {
         
         const otherDisposables = Object

src/core/module-loading.ts

@@ -1,20 +1,19 @@
 import { Result } from 'ts-results-es';
 import { type Observable, from, mergeMap, ObservableInput } from 'rxjs';
 import { readdir, stat } from 'fs/promises';
-import { basename, extname, join, resolve, parse } from 'path';
+import { basename, extname, join, resolve, parse, dirname } from 'path';
 import assert from 'assert';
 import { createRequire } from 'node:module';
 import type { ImportPayload, Wrapper } from '../types/core';
 import type { Module } from '../types/core-modules';
 import { existsSync } from 'fs';
-import { fileURLToPath } from 'node:url';
 
 export const shouldHandle = (path: string, fpath: string) => {
-    const newPath = new URL(fpath+extname(path), path).href;
-    return {
-        exists: existsSync(fileURLToPath(newPath)),
-        path: newPath
-    }
+    const file_name = fpath+extname(path);
+    let newPath = join(dirname(path), file_name)
+                    .replace(/file:\\?/, "");
+    return { exists: existsSync(newPath),
+             path: 'file:///'+newPath };
 }
 
 
@@ -79,11 +78,9 @@ const isSkippable = (filename: string) => {
 
 async function deriveFileInfo(dir: string, file: string) {
     const fullPath = join(dir, file);
-    return {
-        fullPath,
-        fileStats: await stat(fullPath),
-        base: basename(file),
-    };
+    return { fullPath,
+             fileStats: await stat(fullPath),
+             base: basename(file) };
 }
 
 async function* readPaths(dir: string): AsyncGenerator<string> {
@@ -130,12 +127,9 @@ export function loadConfig(wrapper: Wrapper | 'file'): Wrapper {
         eventsPath = makePath('events');
         console.log('Events path is set to', eventsPath);
     }
-    
 
-    return {
-        defaultPrefix: config.defaultPrefix,
-        commands: commandsPath,
-        events: eventsPath,
-    };
+    return { defaultPrefix: config.defaultPrefix,
+             commands: commandsPath,
+             events: eventsPath };
     
 }

src/core/modules.ts

@@ -93,9 +93,9 @@ export abstract class CommandExecutable<const Type extends CommandType = Command
 }
 
 /**
- * @deprecated
- * Will be removed in future
- */
+  * @deprecated
+  * Will be removed in future
+  */
 export abstract class EventExecutable<Type extends EventType> {
     abstract type: Type;
     plugins: AnyEventPlugin[] = [];

src/core/operators.ts

@@ -28,16 +28,15 @@ export function filterMapTo<V>(item: () => V): OperatorFunction<boolean, V> {
     return concatMap(shouldKeep => (shouldKeep ? of(item()) : EMPTY));
 }
 
+interface PluginExecutable {
+    execute: (...args: unknown[]) => PluginResult;
+};
 /**
  * Calls any plugin with {args}.
  * @param args if an array, its spread and plugin called.
  */
-export function callPlugin(args: unknown): OperatorFunction<
-    {
-        execute: (...args: unknown[]) => PluginResult;
-    },
-    VoidResult
-> {
+export function callPlugin(args: unknown): OperatorFunction<PluginExecutable, VoidResult> 
+{
     return concatMap(async plugin => {
         if (Array.isArray(args)) {
             return plugin.execute(...args);
@@ -79,8 +78,6 @@ export const filterTap = <K, R>(onErr: (e: R) => void): OperatorFunction<Result<
             }
             onErr(result.error);
             return EMPTY
-
-        })
-    )
+        }))
 
 

src/core/presences.ts

@@ -22,7 +22,7 @@ export type Config <T extends (keyof Dependencies)[]> =
 
 /**
   * A small wrapper to provide type inference.
-  * Create a Presence module which **MUST** be put in a file called presence.<language-extension> 
+  * Create a Presence module which **MUST** be put in a file called presence.(language-extension)
   * adjacent to the file where **Sern.init** is CALLED.
   */
 export function module<T extends (keyof Dependencies)[]>

src/core/structures/command-error.ts

@@ -1,41 +0,0 @@
-import type { ReplyOptions } from "../../types/utility";
-import type { Logging } from "../contracts";
-
-export interface Response { 
-    type: 'fail' | 'continue';
-    body?: ReplyOptions;
-    log?: { type: keyof Logging; message: unknown }
-}
-
-export const of = () => {
-    const payload = {
-        type: 'fail',
-        body: undefined,
-        log : undefined
-    } as Record<PropertyKey, unknown>
-
-    return {
-        /**
-          * @param {'fail' | 'continue'} p  a status to determine if the error will 
-          * terminate your application or continue. Warning and 
-         */
-        status: (p: 'fail' | 'continue') => {
-            payload.type = p;
-            return payload;  
-        },
-        /**
-          * @param {keyof Logging} type Determine to log to logger[type].
-          * @param {T} message the message to log
-          *
-          * Log this error with the logger.
-          */
-        log: <T=string>(type: keyof Logging, message: T) => {
-            payload.log = { type, message };
-            return payload;
-        },
-        reply: (bodyContent: ReplyOptions) => {
-            payload.body = bodyContent;
-            return payload;
-        }
-    };
-}

src/core/structures/context.ts

@@ -114,7 +114,7 @@ export class Context extends CoreContext<Message, ChatInputCommandInteraction> {
         if ('interaction' in wrappable) {
             return new Context(Ok(wrappable));
         }
-        assert.ok(wrappable.isChatInputCommand());
+        assert.ok(wrappable.isChatInputCommand(), "Context created with bad interaction.");
         return new Context(Err(wrappable));
     }
 }

src/core/structures/core-context.ts

@@ -7,7 +7,7 @@ import * as assert from 'node:assert';
  */
 export abstract class CoreContext<M, I> {
     protected constructor(protected ctx: Either<M, I>) {
-        assert.ok(typeof ctx === 'object' && ctx != null);
+        assert.ok(typeof ctx === 'object' && ctx != null, "Context was nonobject or null");
     }
     get message(): M {
         return this.ctx.expect(SernError.MismatchEvent);

src/core/structures/index.ts

@@ -3,4 +3,3 @@ export * from './context';
 export * from './sern-emitter';
 export * from './services';
 export * from './module-store';
-export * as CommandError from './command-error';

src/core/structures/services/module-manager.ts

@@ -44,7 +44,10 @@ export class DefaultModuleManager implements ModuleManager {
         const publishable = 0b000000110;
         return Promise.all(
             Array.from(entries)
-                .filter(([id]) => !(Number.parseInt(id.at(-1)!) & publishable))
+                .filter(([id]) => {
+                    const last_entry = id.at(-1);
+                    return last_entry == 'B' ||  !(publishable & Number.parseInt(last_entry!));
+                })
                 .map(([, path]) => Files.importModule<CommandModule>(path)),
         );
     }

src/handlers/dispatchers.ts

@@ -11,7 +11,8 @@ import {
 import { createResultResolver } from './event-utils';
 import { BaseInteraction, Message } from 'discord.js';
 import { CommandType, Context } from '../core';
-import type { AnyFunction, Args } from '../types/utility';
+import type { Args } from '../types/utility';
+import { inspect } from 'node:util'
 import type { CommandModule, Module, Processed } from '../types/core-modules';
 
 //TODO: refactor dispatchers so that it implements a strategy for each different type of payload?
@@ -75,11 +76,8 @@ export function createDispatcher(payload: {
         case CommandType.Both: {
             if (isAutocomplete(payload.event)) {
                 const option = treeSearch(payload.event, payload.module.options);
-                assert.ok(
-                    option,
-                    Error(SernError.NotSupportedInteraction + ` There is no autocomplete tag for this option`),
-                );
-                const { command, name, parent } = option;
+                assert.ok(option, SernError.NotSupportedInteraction + ` There is no autocomplete tag for ` + inspect(payload.module));
+                const { command } = option;
             
              	return {
                     ...payload,

src/handlers/event-utils.ts

@@ -21,17 +21,17 @@ import {
     handleError,
     SernError,
     VoidResult,
-    useContainerRaw,
 } from '../core/_internal';
 import { Emitter, ErrorHandling, Logging, ModuleManager } from '../core';
 import { contextArgs, createDispatcher } from './dispatchers';
 import { ObservableInput, pipe } from 'rxjs';
 import { SernEmitter } from '../core';
 import { Err, Ok, Result } from 'ts-results-es';
-import type { AnyFunction, Awaitable } from '../types/utility';
+import type { Awaitable } from '../types/utility';
 import type { ControlPlugin } from '../types/core-plugin';
 import type { AnyModule, CommandModule, Module, Processed } from '../types/core-modules';
 import type { ImportPayload } from '../types/core';
+import { disposeAll } from '../core/ioc/base';
 
 function createGenericHandler<Source, Narrowed extends Source, Output>(
     source: Observable<Source>,
@@ -71,19 +71,23 @@ export function createInteractionHandler<T extends Interaction>(
     return createGenericHandler<Interaction, T, Result<ReturnType<typeof createDispatcher>, void>>(
         source,
         async event => {
-            const fullPath = mg.get(Id.reconstruct(event));
-            if(!fullPath) {
-                return Err.EMPTY
+            const possibleIds = Id.reconstruct(event);
+            let fullPaths= possibleIds
+                .map(id => mg.get(id))
+                .filter((id): id is string => id !== undefined);
+
+            if(fullPaths.length == 0) {
+                return Err.EMPTY;
             }
+            const [ path ] = fullPaths;
             return Files
-                .defaultModuleLoader<Processed<CommandModule>>(fullPath)
-                .then(payload =>
-                   Ok(createDispatcher({ 
-                       module: payload.module,
-                       event,
-                      })));
-        },
-    );
+            .defaultModuleLoader<Processed<CommandModule>>(path)
+            .then(payload => Ok(createDispatcher({ 
+                                    module: payload.module, 
+                                    event,
+                                })));
+    },
+);
 }
 
 export function createMessageHandler(
@@ -93,17 +97,18 @@ export function createMessageHandler(
 ) {
     return createGenericHandler(source, async event => {
         const [prefix, ...rest] = fmt(event.content, defaultPrefix);
-        const fullPath = mg.get(`${prefix}_A1`);
-
+        let fullPath = mg.get(`${prefix}_T`);
         if(!fullPath) {
-            return Err('Possibly undefined behavior: could not find a static id to resolve')
+            fullPath = mg.get(`${prefix}_B`);
+            if(!fullPath) {
+                return Err('Possibly undefined behavior: could not find a static id to resolve');
+            }
         }
         return Files
             .defaultModuleLoader<Processed<CommandModule>>(fullPath)
-            .then((payload)=> {
+            .then(payload => {
                 const args = contextArgs(event, rest);
                 return Ok({ args, ...payload });
-
             });
     });
 }
@@ -172,6 +177,8 @@ export function executeModule(
     );
 }
 
+
+
 /**
  * A higher order function that
  * - creates a stream of {@link VoidResult} { config.createStream }
@@ -258,8 +265,5 @@ export const handleCrash = (err: ErrorHandling, log?: Logging) =>
             log?.info({
                 message: 'A stream closed or reached end of lifetime',
             });
-            useContainerRaw()
-                ?.disposeAll()
-                .then(() => log?.info({ message: 'Cleaning container and crashing' }));
-        }),
-    );
+            disposeAll(log);
+        }));

src/handlers/interaction-event.ts

@@ -28,6 +28,5 @@ export function interactionHandler([emitter, err, log, modules, client]: Depende
             filterTap(e => emitter.emit('warning', SernEmitter.warning(e))),
             makeModuleExecutor(module => 
                 emitter.emit('module.activate', SernEmitter.failure(module, SernError.PluginFailure))),
-            mergeMap(payload => executeModule(emitter, log, err, payload)),
-    );
+            mergeMap(payload => executeModule(emitter, log, err, payload)));
 }

src/handlers/message-event.ts

@@ -42,6 +42,5 @@ export function messageHandler(
         makeModuleExecutor(module => {
             emitter.emit('module.activate', SernEmitter.failure(module, SernError.PluginFailure));
         }),
-        mergeMap(payload => executeModule(emitter, log, err, payload)),
-    );
+        mergeMap(payload => executeModule(emitter, log, err, payload)));
 }

src/handlers/presence.ts

@@ -42,5 +42,5 @@ export const presenceHandler = (path: string, setPresence: SetPresence) => {
         //concatMap resolves the promise, and passes it to the next concatMap.
         concatMap(fn => parseConfig(fn())),
         // subscribe to the observable parseConfig yields, and set the presence.
-        concatMap(conf => conf.pipe(map(setPresence))))
+        concatMap(conf => conf.pipe(map(setPresence))));
 }

src/handlers/ready-event.ts

@@ -39,8 +39,12 @@ function register<T extends Processed<AnyModule>>(
         validModuleType,
         `Found ${module.name} at ${fullPath}, which does not have a valid type`,
     );
-    if (module.type === CommandType.Both || module.type === CommandType.Text) {
-        module.alias?.forEach(a => manager.set(`${a}_A1`, fullPath));
+    if (module.type === CommandType.Both) {
+        module.alias?.forEach(a => manager.set(`${a}_B`, fullPath));
+    } else {
+        if(module.type === CommandType.Text){ 
+            module.alias?.forEach(a => manager.set(`${a}_T`, fullPath));
+        }
     }
     return Result.wrap(() => manager.set(id, fullPath));
 }

src/index.ts

@@ -55,4 +55,3 @@ export * as Presence from './core/presences'
 export {
     useContainerRaw
 } from './core/_internal'
-export { controller } from './sern';

src/sern.ts

@@ -34,6 +34,7 @@ export function init(maybeWrapper: Wrapper | 'file') {
     if (wrapper.events !== undefined) {
         eventsHandler(dependencies, Files.getFullPathTree(wrapper.events));
     }
+
     const initCallsite = callsites()[1].getFileName();
     const presencePath = Files.shouldHandle(initCallsite!, "presence");
     //Ready event: load all modules and when finished, time should be taken and logged
@@ -66,11 +67,4 @@ function useDependencies() {
     );
 }
 
-/**
- * @since 1.0.0
- * The object passed into every plugin to control a command's behavior
- */
-export const controller = {
-    next: ok,
-    stop: err,
-};
+

test/handlers/id.test.ts

@@ -2,7 +2,6 @@ import { describe, expect, it, vi } from 'vitest';
 import * as Id from '../../src/core/id';
 import { faker } from '@faker-js/faker';
 import { CommandModule, CommandType, commandModule } from '../../src';
-import { CommandTypeDiscordApi } from '../../src/core/id';
 
 function createRandomCommandModules() {
     const randomCommandType = [
@@ -41,32 +40,8 @@ describe('id resolution', () => {
         const metadata = modules.map(createMetadata);
         metadata.forEach((meta, idx) => {
             const associatedModule = modules[idx];
-            const am = (appBitField & associatedModule.type) !== 0 ? 'A' : 'C';
-            let uid = 0;
-            if (
-                associatedModule.type === CommandType.Both ||
-                associatedModule.type === CommandType.Modal
-            ) {
-                uid = 1;
-            } else {
-                uid = CommandTypeDiscordApi[Math.log2(associatedModule.type)];
-            }
-            expect(meta.id).toBe(associatedModule.name + '_' + am + uid);
+            const uid = Id.create(associatedModule.name!, associatedModule.type!);
+            expect(meta.id).toBe(uid);
         });
     });
-
-    it('maps commands type to discord components or application commands', () => {
-        expect(CommandTypeDiscordApi[Math.log2(CommandType.Text)]).toBe(1);
-
-        expect(CommandTypeDiscordApi[1]).toBe(1);
-        expect(CommandTypeDiscordApi[Math.log2(CommandType.CtxUser)]).toBe(2);
-        expect(CommandTypeDiscordApi[Math.log2(CommandType.CtxMsg)]).toBe(3);
-        expect(CommandTypeDiscordApi[Math.log2(CommandType.Button)]).toBe(2);
-        expect(CommandTypeDiscordApi[Math.log2(CommandType.StringSelect)]).toBe(3);
-        expect(CommandTypeDiscordApi[Math.log2(CommandType.UserSelect)]).toBe(5);
-        expect(CommandTypeDiscordApi[Math.log2(CommandType.RoleSelect)]).toBe(6);
-        expect(CommandTypeDiscordApi[Math.log2(CommandType.MentionableSelect)]).toBe(7);
-        expect(CommandTypeDiscordApi[Math.log2(CommandType.ChannelSelect)]).toBe(8);
-        expect(CommandTypeDiscordApi[6]).toBe(1);
-    });
 });