resolve option values

thenorthsolution · Jun 14, 2024 · 8933e30 · 8933e30
1 parent aee326f
commit 8933e30
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 7 deletions.
diff --git a/packages/message-command-utils/src/classes/builders/MessageCommandBooleanOptionBuilder.ts b/packages/message-command-utils/src/classes/builders/MessageCommandBooleanOptionBuilder.ts
@@ -1,4 +1,4 @@
-import { MessageCommandOptionBuilderData, MessageCommandOptionBuilderResolveValueOptions } from '@reciple/core';
+import { MessageCommandOptionBuilderData, MessageCommandOptionBuilderResolveValueOptions, MessageCommandOptionManager } from '@reciple/core';
 import { boolean, isBooleanable } from 'boolean';
 import { BaseMessageCommandOptionBuilder } from '../structures/BaseMessageCommandOptionBuilder.js';
 
@@ -17,4 +17,11 @@ export class MessageCommandBooleanOptionBuilder extends BaseMessageCommandOption
         if (!isBooleanable(options.value)) return new Error('Value is not booleanable');
         return true;
     }
+
+    public static async resolveOption(name: string, options: MessageCommandOptionManager, required?: false): Promise<boolean|null>;
+    public static async resolveOption(name: string, options: MessageCommandOptionManager, required?: true): Promise<boolean>
+    public static async resolveOption(name: string, options: MessageCommandOptionManager, required?: boolean): Promise<boolean|null>;
+    public static async resolveOption(name: string, options: MessageCommandOptionManager, required?: boolean): Promise<boolean|null> {
+        return super.resolveOption(name, options, required);
+    }
 }
diff --git a/packages/message-command-utils/src/classes/builders/MessageCommandChannelOptionBuilder.ts b/packages/message-command-utils/src/classes/builders/MessageCommandChannelOptionBuilder.ts
@@ -1,4 +1,4 @@
-import { MessageCommandOptionBuilderData, MessageCommandOptionBuilderResolveValueOptions } from '@reciple/core';
+import { MessageCommandOptionBuilderData, MessageCommandOptionBuilderResolveValueOptions, MessageCommandOptionManager } from '@reciple/core';
 import { Mentions } from '@reciple/utils';
 import { Channel, ChannelType, normalizeArray, RestOrArray } from 'discord.js';
 import { BaseMessageCommandOptionBuilder } from '../structures/BaseMessageCommandOptionBuilder.js';
@@ -51,4 +51,8 @@ export class MessageCommandChannelOptionBuilder extends BaseMessageCommandOption
 
         return true;
     }
+
+    public static async resolveOption(name: string, options: MessageCommandOptionManager, required?: boolean): Promise<Channel|null> {
+        return super.resolveOption(name, options, required);
+    }
 }
diff --git a/packages/message-command-utils/src/classes/builders/MessageCommandIntegerOptionBuilder.ts b/packages/message-command-utils/src/classes/builders/MessageCommandIntegerOptionBuilder.ts
@@ -1,4 +1,4 @@
-import { MessageCommandOptionBuilderData, MessageCommandOptionBuilderResolveValueOptions } from '@reciple/core';
+import { MessageCommandOptionBuilderData, MessageCommandOptionBuilderResolveValueOptions, MessageCommandOptionManager } from '@reciple/core';
 import { BaseMessageCommandOptionBuilder } from '../structures/BaseMessageCommandOptionBuilder.js';
 
 export interface MessageCommandIntegerOptionBuilderData extends MessageCommandOptionBuilderData<number> {
@@ -39,4 +39,11 @@ export class MessageCommandIntegerOptionBuilder extends BaseMessageCommandOption
 
         return true;
     }
+
+    public static async resolveOption(name: string, options: MessageCommandOptionManager, required?: false): Promise<number|null>;
+    public static async resolveOption(name: string, options: MessageCommandOptionManager, required?: true): Promise<number>
+    public static async resolveOption(name: string, options: MessageCommandOptionManager, required?: boolean): Promise<number|null>;
+    public static async resolveOption(name: string, options: MessageCommandOptionManager, required?: boolean): Promise<number|null> {
+        return super.resolveOption(name, options, required);
+    }
 }
diff --git a/packages/message-command-utils/src/classes/builders/MessageCommandNumberOptionBuilder.ts b/packages/message-command-utils/src/classes/builders/MessageCommandNumberOptionBuilder.ts
@@ -1,4 +1,4 @@
-import { MessageCommandOptionBuilderData, MessageCommandOptionBuilderResolveValueOptions } from '@reciple/core';
+import { MessageCommandOptionBuilderData, MessageCommandOptionBuilderResolveValueOptions, MessageCommandOptionManager } from '@reciple/core';
 import { BaseMessageCommandOptionBuilder } from '../structures/BaseMessageCommandOptionBuilder.js';
 
 export interface MessageCommandNumberOptionBuilderData extends MessageCommandOptionBuilderData<number> {
@@ -39,4 +39,11 @@ export class MessageCommandNumberOptionBuilder extends BaseMessageCommandOptionB
 
         return true;
     }
+
+    public static async resolveOption(name: string, options: MessageCommandOptionManager, required?: false): Promise<number|null>;
+    public static async resolveOption(name: string, options: MessageCommandOptionManager, required?: true): Promise<number>
+    public static async resolveOption(name: string, options: MessageCommandOptionManager, required?: boolean): Promise<number|null>;
+    public static async resolveOption(name: string, options: MessageCommandOptionManager, required?: boolean): Promise<number|null> {
+        return super.resolveOption(name, options, required);
+    }
 }
diff --git a/packages/message-command-utils/src/classes/builders/MessageCommandRoleOptionBuilder.ts b/packages/message-command-utils/src/classes/builders/MessageCommandRoleOptionBuilder.ts
@@ -1,4 +1,4 @@
-import { MessageCommandOptionBuilderData, MessageCommandOptionBuilderResolveValueOptions } from '@reciple/core';
+import { MessageCommandOptionBuilderData, MessageCommandOptionBuilderResolveValueOptions, MessageCommandOptionManager } from '@reciple/core';
 import { Mentions } from '@reciple/utils';
 import { Role } from 'discord.js';
 import { BaseMessageCommandOptionBuilder } from '../structures/BaseMessageCommandOptionBuilder.js';
@@ -33,4 +33,8 @@ export class MessageCommandRoleOptionBuilder extends BaseMessageCommandOptionBui
         if (!role) return new Error(`Role ${options.value} not found`);
         return true;
     }
+
+    public static async resolveOption(name: string, options: MessageCommandOptionManager, required?: boolean): Promise<Role|null> {
+        return super.resolveOption(name, options, required);
+    }
 }
diff --git a/packages/message-command-utils/src/classes/builders/MessageCommandUserOptionBuilder.ts b/packages/message-command-utils/src/classes/builders/MessageCommandUserOptionBuilder.ts
@@ -1,4 +1,4 @@
-import { MessageCommandOptionBuilderData, MessageCommandOptionBuilderResolveValueOptions } from '@reciple/core';
+import { MessageCommandOptionBuilderData, MessageCommandOptionBuilderResolveValueOptions, MessageCommandOptionManager } from '@reciple/core';
 import { Mentions } from '@reciple/utils';
 import { User } from 'discord.js';
 import { BaseMessageCommandOptionBuilder } from '../structures/BaseMessageCommandOptionBuilder.js';
@@ -34,4 +34,11 @@ export class MessageCommandUserOptionBuilder extends BaseMessageCommandOptionBui
         if (!this.allow_bots && user.bot) return new Error(`User ${options.value} is a bot`);
         return true;
     }
+
+    public static async resolveOption(name: string, options: MessageCommandOptionManager, required?: false): Promise<User|null>;
+    public static async resolveOption(name: string, options: MessageCommandOptionManager, required?: true): Promise<User>
+    public static async resolveOption(name: string, options: MessageCommandOptionManager, required?: boolean): Promise<User|null>;
+    public static async resolveOption(name: string, options: MessageCommandOptionManager, required?: boolean): Promise<User|null> {
+        return super.resolveOption(name, options, required);
+    }
 }
diff --git a/packages/message-command-utils/src/classes/structures/BaseMessageCommandOptionBuilder.ts b/packages/message-command-utils/src/classes/structures/BaseMessageCommandOptionBuilder.ts
@@ -1,4 +1,4 @@
-import { MessageCommandOptionBuilder, MessageCommandOptionBuilderData, MessageCommandOptionBuilderResolveValueOptions, MessageCommandOptionValidators } from '@reciple/core';
+import { MessageCommandOptionBuilder, MessageCommandOptionBuilderData, MessageCommandOptionBuilderResolveValueOptions, MessageCommandOptionManager, MessageCommandOptionValidators } from '@reciple/core';
 
 export abstract class BaseMessageCommandOptionBuilder<T extends any = any> extends (MessageCommandOptionBuilder as (new <T extends any>(options?: MessageCommandOptionBuilderData<T>) => Omit<MessageCommandOptionBuilder<T>, 'setName'|'setDescription'|'setRequired'|'setResolveValue'|'setValidate'>))<T> {
     constructor(data?: MessageCommandOptionBuilderData<T>) {
@@ -37,4 +37,14 @@ export abstract class BaseMessageCommandOptionBuilder<T extends any = any> exten
 
     public abstract readonly resolve_value?: ((options: MessageCommandOptionBuilderResolveValueOptions<T>) => any) | undefined;
     public abstract readonly validate?: ((options: MessageCommandOptionBuilderResolveValueOptions<T>) => any) | undefined;
+
+    public static async resolveOption(name: string, options: MessageCommandOptionManager, required?: boolean): Promise<any|null> {
+        switch (required) {
+            case true:
+                return options.getOptionValue(name, { resolveValue: true, required: true });
+            case false:
+            case undefined:
+                return options.getOptionValue(name, { resolveValue: true, required: false });
+        }
+    }
 }