refactor: expose runInTypeIsSpecificsObject as public static method on Command

Author: favna

src/lib/structures/Command.ts

@@ -23,14 +23,6 @@ import type { CommandStore } from './CommandStore';
 
 const ChannelTypes = Object.values(ChannelType).filter((type) => typeof type === 'number') as readonly ChannelType[];
 const GuildChannelTypes = ChannelTypes.filter((type) => type !== ChannelType.DM && type !== ChannelType.GroupDM) as readonly ChannelType[];
-function runInTypeIsSpecificsObject(types: Command.Options['runIn']): types is CommandSpecificRunIn {
-	if (!isObject(types)) {
-		return false;
-	}
-
-	const specificTypes = types as CommandSpecificRunIn;
-	return Boolean(specificTypes.chatInputRun || specificTypes.messageRun || specificTypes.contextMenuRun);
-}
 
 export class Command<PreParseReturn = Args, O extends Command.Options = Command.Options> extends AliasPiece<O> {
 	/**
@@ -372,7 +364,7 @@ export class Command<PreParseReturn = Args, O extends Command.Options = Command.
 		// Early return if there's no runIn option:
 		if (isNullish(options.runIn)) return;
 
-		if (runInTypeIsSpecificsObject(options.runIn)) {
+		if (Command.runInTypeIsSpecificsObject(options.runIn)) {
 			const messageRunTypes = this.resolveConstructorPreConditionsRunType(options.runIn.messageRun);
 			const chatInputRunTypes = this.resolveConstructorPreConditionsRunType(options.runIn.chatInputRun);
 			const contextMenuRunTypes = this.resolveConstructorPreConditionsRunType(options.runIn.contextMenuRun);
@@ -497,6 +489,15 @@ export class Command<PreParseReturn = Args, O extends Command.Options = Command.
 		// Return the resolved types in ascending order:
 		return [...resolved].sort((a, b) => a - b);
 	}
+
+	public static runInTypeIsSpecificsObject(types: Command.Options['runIn']): types is CommandSpecificRunIn {
+		if (!isObject(types)) {
+			return false;
+		}
+
+		const specificTypes = types as CommandSpecificRunIn;
+		return Boolean(specificTypes.chatInputRun || specificTypes.messageRun || specificTypes.contextMenuRun);
+	}
 }
 
 export type MessageCommand = Command & Required<Pick<Command, 'messageRun'>>;

src/preconditions/RunIn.ts

@@ -1,7 +1,7 @@
-import type { ChannelType, ChatInputCommandInteraction, ContextMenuCommandInteraction, Message } from 'discord.js';
+import type { ChatInputCommandInteraction, ContextMenuCommandInteraction, Message } from 'discord.js';
 import { Identifiers } from '../lib/errors/Identifiers';
-import type { ChatInputCommand, ContextMenuCommand, MessageCommand } from '../lib/structures/Command';
-import { AllFlowsPrecondition, type Preconditions, type RunInPreconditionCommandSpecificData } from '../lib/structures/Precondition';
+import { Command, type ChatInputCommand, type ContextMenuCommand, type MessageCommand } from '../lib/structures/Command';
+import { AllFlowsPrecondition, type Preconditions } from '../lib/structures/Precondition';
 
 export interface RunInPreconditionContext extends AllFlowsPrecondition.Context {
 	types?: Preconditions['RunIn']['types'];
@@ -13,11 +13,11 @@ export class CorePrecondition extends AllFlowsPrecondition {
 
 		const channelType = message.channel.type;
 
-		if (typesIsArray(context.types)) {
-			return context.types.includes(channelType) ? this.ok() : this.makeSharedError(context);
+		if (Command.runInTypeIsSpecificsObject(context.types)) {
+			return context.types.messageRun.includes(channelType) ? this.ok() : this.makeSharedError(context);
 		}
 
-		return context.types.messageRun.includes(channelType) ? this.ok() : this.makeSharedError(context);
+		return context.types.includes(channelType) ? this.ok() : this.makeSharedError(context);
 	}
 
 	public override async chatInputRun(
@@ -29,11 +29,11 @@ export class CorePrecondition extends AllFlowsPrecondition {
 
 		const channelType = (await this.fetchChannelFromInteraction(interaction)).type;
 
-		if (typesIsArray(context.types)) {
-			return context.types.includes(channelType) ? this.ok() : this.makeSharedError(context);
+		if (Command.runInTypeIsSpecificsObject(context.types)) {
+			return context.types.chatInputRun.includes(channelType) ? this.ok() : this.makeSharedError(context);
 		}
 
-		return context.types.chatInputRun.includes(channelType) ? this.ok() : this.makeSharedError(context);
+		return context.types.includes(channelType) ? this.ok() : this.makeSharedError(context);
 	}
 
 	public override async contextMenuRun(
@@ -45,11 +45,11 @@ export class CorePrecondition extends AllFlowsPrecondition {
 
 		const channelType = (await this.fetchChannelFromInteraction(interaction)).type;
 
-		if (typesIsArray(context.types)) {
-			return context.types.includes(channelType) ? this.ok() : this.makeSharedError(context);
+		if (Command.runInTypeIsSpecificsObject(context.types)) {
+			return context.types.contextMenuRun.includes(channelType) ? this.ok() : this.makeSharedError(context);
 		}
 
-		return context.types.contextMenuRun.includes(channelType) ? this.ok() : this.makeSharedError(context);
+		return context.types.includes(channelType) ? this.ok() : this.makeSharedError(context);
 	}
 
 	private makeSharedError(context: RunInPreconditionContext): AllFlowsPrecondition.Result {
@@ -60,7 +60,3 @@ export class CorePrecondition extends AllFlowsPrecondition {
 		});
 	}
 }
-
-function typesIsArray(types: readonly ChannelType[] | RunInPreconditionCommandSpecificData): types is readonly ChannelType[] {
-	return Array.isArray(types);
-}