meocord 4.1.0 → 4.1.2

package/dist/esm/testing/response.js

@@ -55,17 +55,18 @@ const VISIBLE = new Set([
         ...state?.history ?? []
     ];
     const sent = calls.some((call)=>VISIBLE.has(call.method) && !('error' in call));
+    // Each call recorded what its method received, as that method takes it
     if (state) return {
         state: state.state,
         sent,
-        calls
+        calls: calls
     };
     const answered = interaction.isRepliable() ? interaction.replied : false;
     const deferred = interaction.isRepliable() ? interaction.deferred : false;
     return {
         state: answered ? 'replied' : deferred ? 'deferred' : 'unanswered',
         sent: log ? sent : answered,
-        calls
+        calls: calls
     };
 }
 /**

package/dist/types/testing/index.d.cts

@@ -1,5 +1,5 @@
 import { ServiceIdentifier, Container } from 'inversify';
-import { Client, Interaction, Message, MessageReaction, PartialMessageReaction, User, PartialUser, ClientEvents, Locale, GuildMember, Role, GuildBasedChannel, Guild, APIMessageTopLevelComponent, JSONEncodable, APIEmbed, MessageFlagsResolvable, TextBasedChannel, BaseChannel, APIAuthorizingIntegrationOwnersMap, CacheType, CommandInteractionOptionResolver, Attachment, ModalSubmitFields, DiscordAPIError } from 'discord.js';
+import { Client, Interaction, Message, MessageReaction, PartialMessageReaction, User, PartialUser, ClientEvents, Base, Locale, GuildMember, Role, GuildBasedChannel, Guild, APIMessageTopLevelComponent, JSONEncodable, APIEmbed, MessageFlagsResolvable, TextBasedChannel, BaseChannel, APIAuthorizingIntegrationOwnersMap, CacheType, CommandInteractionOptionResolver, ThreadChannel, AnyThreadChannel, ChatInputCommandInteraction, AutocompleteInteraction, MessageContextMenuCommandInteraction, UserContextMenuCommandInteraction, PrimaryEntryPointCommandInteraction, ContextMenuCommandInteraction, CommandInteraction, ButtonInteraction, StringSelectMenuInteraction, UserSelectMenuInteraction, RoleSelectMenuInteraction, MentionableSelectMenuInteraction, ChannelSelectMenuInteraction, MessageComponentInteraction, ModalSubmitInteraction, BaseInteraction, DMChannel, PartialGroupDMChannel, OmitPartialGroupDMChannel, Attachment, ModalSubmitFields, MessagePayload, InteractionReplyOptions, InteractionUpdateOptions, InteractionEditReplyOptions, MessageEditOptions, APIModalInteractionResponseCallbackData, ModalComponentData, InteractionDeferReplyOptions, InteractionDeferUpdateOptions, MessageResolvable, DiscordAPIError } from 'discord.js';
 import { ReactionHandlerAction, CommandType } from '../enum/index.cjs';
 import { a8 as Provider, P as ProviderToken } from '../index-DEP0NYrU.cjs';
 import { CooldownStore, ExecutionContextType, ExecutionContext, CooldownScope, MetadataDecorator, ResponsePhase, ResponseCall } from '../common/index.cjs';
@@ -678,6 +678,17 @@ declare class MeoCordTestingModule {
     static fromApp(app: new (...args: any[]) => unknown, options?: FromAppOptions): TestingModuleBuilder;
 }
 
+type Overloads<T> = T extends {
+    (...args: infer A1): infer R1;
+    (...args: infer A2): infer R2;
+    (...args: infer A3): infer R3;
+    (...args: infer A4): infer R4;
+} ? ((...args: A1) => R1) | ((...args: A2) => R2) | ((...args: A3) => R3) | ((...args: A4) => R4) : T;
+type CallArgs<T> = Parameters<Overloads<T> & ((...args: any[]) => any)>;
+type CallResult<T> = ReturnType<Overloads<T> & ((...args: any[]) => any)>;
+type Implementation<T> = {
+    fn(...args: CallArgs<T>): CallResult<T>;
+}['fn'];
 /**
  * One call's outcome, as a mock function records it: the value it returned, or the error it threw.
  *
@@ -702,13 +713,13 @@ interface MockResult<T = unknown> {
  */
 interface MockState<T extends (...args: any[]) => any = (...args: any[]) => any> {
     /** Arguments from each call, in order. */
-    readonly calls: Parameters<T>[];
+    readonly calls: CallArgs<T>[];
     /** Return / throw result from each call, in order. */
-    readonly results: MockResult<ReturnType<T>>[];
+    readonly results: MockResult<CallResult<T>>[];
     /** The `this` value recorded for each call. */
     readonly instances: any[];
     /** Arguments from the most recent call, or undefined if never called. */
-    readonly lastCall?: Parameters<T>;
+    readonly lastCall?: CallArgs<T>;
 }
 /**
  * The mock API of a mock function: what it has recorded, and the methods that change what it does.
@@ -727,21 +738,21 @@ interface MockInstance<T extends (...args: any[]) => any = (...args: any[]) => a
     /** What the mock has recorded: its calls, their outcomes and their `this`. */
     readonly mock: MockState<T>;
     /** Returns `value` from every call, until another implementation is set. */
-    mockReturnValue(value: ReturnType<T>): MockedFunction<T>;
+    mockReturnValue(value: CallResult<T>): MockedFunction<T>;
     /** Returns `value` from the next call only. */
-    mockReturnValueOnce(value: ReturnType<T>): MockedFunction<T>;
+    mockReturnValueOnce(value: CallResult<T>): MockedFunction<T>;
     /** Resolves every call to `value`. */
-    mockResolvedValue(value: Awaited<ReturnType<T>>): MockedFunction<T>;
+    mockResolvedValue(value: Awaited<CallResult<T>>): MockedFunction<T>;
     /** Resolves the next call only to `value`. */
-    mockResolvedValueOnce(value: Awaited<ReturnType<T>>): MockedFunction<T>;
+    mockResolvedValueOnce(value: Awaited<CallResult<T>>): MockedFunction<T>;
     /** Rejects every call with `value`. */
     mockRejectedValue(value: unknown): MockedFunction<T>;
     /** Rejects the next call only with `value`. */
     mockRejectedValueOnce(value: unknown): MockedFunction<T>;
     /** Runs `fn` for every call. */
-    mockImplementation(fn: T): MockedFunction<T>;
+    mockImplementation(fn: Implementation<T>): MockedFunction<T>;
     /** Runs `fn` for the next call only; `*Once` implementations run in the order they were set. */
-    mockImplementationOnce(fn: T): MockedFunction<T>;
+    mockImplementationOnce(fn: Implementation<T>): MockedFunction<T>;
     /** Forgets the recorded calls, keeping the implementation. */
     mockClear(): MockedFunction<T>;
     /** Forgets the recorded calls, and puts back the implementation the mock was created with. */
@@ -757,7 +768,8 @@ interface MockInstance<T extends (...args: any[]) => any = (...args: any[]) => a
  * A mock function with the signature of `T`, and the mock API of {@link MockInstance}.
  *
  * It takes the place of jest's `MockedFunction<T>` and Vitest's `MockedFunction<T>`. The mock factories type each
- * method of a mock with it, so `interaction.reply.mockResolvedValue(...)` type-checks.
+ * method of a mock with it, so `interaction.reply.mockResolvedValue(...)` type-checks. For an overloaded method, such as
+ * a manager's `fetch`, the mock API takes what any of its overloads takes or returns.
  *
  * @group Testing
  * @category Mocks
@@ -864,7 +876,8 @@ declare function resetAllMocks(): void;
 declare function createMockFn<T extends (...args: any[]) => any = (...args: any[]) => any>(impl?: T): MockedFunction<T>;
 
 /**
- * A mock of `T`: every method a mock function, and every nested object mocked in turn, five levels deep.
+ * A mock of `T`: every method a mock function, and every nested object mocked in turn, five levels deep, including a
+ * discord.js structure that may be absent, such as a message's `member`, when it is present.
  *
  * It is what the mock factories return. It is assignable wherever `T` is expected, and each method takes
  * `mockResolvedValue` and the rest of {@link MockInstance}.
@@ -878,7 +891,7 @@ declare function createMockFn<T extends (...args: any[]) => any = (...args: any[
  * @see {@link createMock}
  */
 type DeepMocked<T, Depth extends number[] = []> = Depth['length'] extends 5 ? T : {
-    -readonly [K in keyof T]: T[K] extends (...args: infer A) => infer R ? MockedFunction<(...args: A) => R> : T[K] extends object ? DeepMocked<T[K], [...Depth, 0]> : T[K];
+    -readonly [K in keyof T]: T[K] extends (...args: any[]) => any ? MockedFunction<T[K]> : T[K] extends object ? DeepMocked<T[K], [...Depth, 0]> : Depth extends [] ? NonNullable<T[K]> extends Base ? DeepMocked<NonNullable<T[K]>, [...Depth, 0]> | Extract<T[K], null | undefined> : T[K] : T[K];
 } & T;
 /**
  * Property values a mock factory sets as it builds the mock.
@@ -906,6 +919,14 @@ interface InteractionClass<T> {
     prototype: T;
     name: string;
 }
+type WithCache<T, C extends CacheType> = T extends ChatInputCommandInteraction<any> ? ChatInputCommandInteraction<C> : T extends AutocompleteInteraction<any> ? AutocompleteInteraction<C> : T extends MessageContextMenuCommandInteraction<any> ? MessageContextMenuCommandInteraction<C> : T extends UserContextMenuCommandInteraction<any> ? UserContextMenuCommandInteraction<C> : T extends PrimaryEntryPointCommandInteraction<any> ? PrimaryEntryPointCommandInteraction<C> : T extends ContextMenuCommandInteraction<any> ? ContextMenuCommandInteraction<C> : T extends CommandInteraction<any> ? CommandInteraction<C> : T extends ButtonInteraction<any> ? ButtonInteraction<C> : T extends StringSelectMenuInteraction<any> ? StringSelectMenuInteraction<C> : T extends UserSelectMenuInteraction<any> ? UserSelectMenuInteraction<C> : T extends RoleSelectMenuInteraction<any> ? RoleSelectMenuInteraction<C> : T extends MentionableSelectMenuInteraction<any> ? MentionableSelectMenuInteraction<C> : T extends ChannelSelectMenuInteraction<any> ? ChannelSelectMenuInteraction<C> : T extends MessageComponentInteraction<any> ? MessageComponentInteraction<C> : T extends ModalSubmitInteraction<any> ? ModalSubmitInteraction<C> : T extends BaseInteraction<any> ? BaseInteraction<C> : T;
+type OutsideServer = {
+    guild: null;
+} | {
+    member: null;
+} | {
+    channel: DMChannel | PartialGroupDMChannel;
+};
 /**
  * Creates a mock instance of a discord.js class, such as an interaction, keeping its prototype so `instanceof` holds.
  *
@@ -931,6 +952,9 @@ interface InteractionClass<T> {
  * {@link getResponse} reports every answer the interaction got. Every method is a mock function, and one that returns a
  * promise in discord.js resolves.
  *
+ * Given `guild: null`, `member: null` or a DM channel, it is typed as an interaction that may come from anywhere, so
+ * its `guild` and `member` read as possibly `null`; otherwise as one from a server the bot is in.
+ *
  * @param Class - The discord.js class to mock.
  * @param props - Values for properties the class declares `readonly`; see {@link MockProps}.
  *
@@ -952,6 +976,28 @@ interface InteractionClass<T> {
  * @see {@link https://meocord.dev/docs/4.1/mocks | Mocks}
  */
 declare function createMockInteraction<T extends object>(Class: InteractionClass<T>, props?: MockProps<T>): DeepMocked<T>;
+/**
+ * Creates a mock interaction from outside a server: one given `guild: null`, `member: null` or a DM channel, as from a
+ * direct message or a server the bot isn't in.
+ *
+ * It is typed as discord.js types an interaction that may come from anywhere, so its `guild` and `member` may be
+ * `null`. Everything else is as {@link createMockInteraction} builds it from a server.
+ *
+ * @param Class - The discord.js interaction class to mock.
+ * @param props - The interaction's properties, with `guild: null`, `member: null` or a DM `channel`; see {@link MockProps}.
+ *
+ * @example
+ * ```ts
+ * import { expect } from 'vitest'
+ *
+ * const command = createMockInteraction(ChatInputCommandInteraction, { channel: createMockChannel(DMChannel), guild: null })
+ * expect(command.inGuild()).toBe(false)
+ * ```
+ *
+ * @group Testing
+ * @category Mocks
+ */
+declare function createMockInteraction<T extends object>(Class: InteractionClass<T>, props: MockProps<WithCache<T, CacheType>> & OutsideServer): DeepMocked<WithCache<T, CacheType>>;
 /**
  * Creates a mock of any type, with no class needed, for service doubles and interfaces.
  *
@@ -1029,7 +1075,7 @@ declare const createMockUser: (props?: MockProps<User>) => DeepMocked<User>;
  * import { expect } from 'vitest'
  *
  * const client = createMockClient()
- * const botId = client.user!.id
+ * const botId = client.user.id
  * const message = createMockMessage({ content: `<@${botId}> help`, client })
  * expect(message.mentions.users.has(botId)).toBe(true)
  * ```
@@ -1038,7 +1084,7 @@ declare const createMockUser: (props?: MockProps<User>) => DeepMocked<User>;
  * @category Mocks
  * @see {@link createMockMessage}
  */
-declare function createMockClient(): DeepMocked<Client>;
+declare function createMockClient(): DeepMocked<Client<true>>;
 /**
  * What {@link createMockGuild} puts in the guild's caches, as the gateway would have filled them.
  *
@@ -1070,14 +1116,18 @@ interface MockGuildOverrides {
  *
  * @remarks
  * A manager's `fetch(id)` resolves to its cached item with that id, as discord.js looks there first, or to a new one it
- * caches under that id: a member or channel in this guild, a role with that id, or a ban; `create()` and `edit()`
- * resolve to a mock of its item, and a list fetch to an empty collection. Members, roles and channels given are put in
+ * caches under that id: a member or channel in this guild, a role with that id, or a ban. `members.fetch({ user: ids })`
+ * resolves to a collection of each of those members, found or made the same way; `create()` and `edit()` resolve to a
+ * mock of its item, and a list fetch to an empty collection. Members, roles and channels given are put in
  * their managers' caches, where dispatch looks first when it resolves a message's typed params; a member
  * {@link createMockMember} made without a server is in this one. Its `roles.everyone` is the role given with the
  * guild's id, or else an @everyone role of its own at position 0 with no permissions, in `roles.cache` as Discord has
  * it. The guild is named `'Guild'` and its `preferredLocale` is `'en-US'` unless given, so `t.forGuild(guild)`
  * translates as for a new English server.
  *
+ * The mock makes a member for any id it's asked for, so a test of an id that isn't a member rejects the fetch, as
+ * `guild.members.fetch.mockRejectedValue(createDiscordError(10007))`, or resolves a collection without that member.
+ *
  * @example
  * ```ts
  * const target = createMock<GuildMember>({ id: '111111111111111111' })
@@ -1091,6 +1141,7 @@ interface MockGuildOverrides {
  * @see {@link createMockMessage}
  */
 declare function createMockGuild(overrides?: MockGuildOverrides): DeepMocked<Guild>;
+type ChannelOf<T> = T extends ThreadChannel ? AnyThreadChannel : T;
 /**
  * Creates a mock channel of the given class, such as `TextChannel`, `ThreadChannel` or `DMChannel`.
  *
@@ -1100,7 +1151,8 @@ declare function createMockGuild(overrides?: MockGuildOverrides): DeepMocked<Gui
  * The managers the class has are ready to stub: `messages`, `threads` on text, announcement, forum and media channels,
  * and `members` on threads, each with a real, empty `cache` and the channel as its `channel`, or `thread`. A subclass gets the managers of the class it extends.
  * Type guards such as `isTextBased()`, `isDMBased()` and `isThread()` run discord.js's own logic, so each answers what
- * the channel is.
+ * the channel is. A thread is typed as discord.js types every thread it gives, a public or a private one, so it fits
+ * an interaction's `channel`, a guild's channels and the `threadCreate` event.
  *
  * @param Class - The discord.js channel class to mock.
  * @param props - Values for the channel's properties, such as its `id`, `name` or `topic`; see {@link MockProps}.
@@ -1118,7 +1170,7 @@ declare function createMockGuild(overrides?: MockGuildOverrides): DeepMocked<Gui
  * @category Mocks
  * @see {@link createMockGuild}
  */
-declare function createMockChannel<T extends BaseChannel>(Class: InteractionClass<T>, props?: MockProps<T>): DeepMocked<T>;
+declare function createMockChannel<T extends BaseChannel>(Class: InteractionClass<T>, props?: MockProps<T>): DeepMocked<ChannelOf<T>>;
 /**
  * What {@link createMockMember} builds a member with.
  *
@@ -1226,7 +1278,8 @@ interface MockMessageOverrides {
  * and `reply()` resolve to a new mock message. Without overrides the message is empty, in a server, from a new
  * person who is its `member`; with `guild: null` it is a direct message. Give `author` to send several messages as
  * one user, such as to reach a per-user cooldown. An author given, and the users, roles and channels the content
- * mentions, are cached as the gateway delivers them.
+ * mentions, are cached as the gateway delivers them. It is typed as discord.js emits a message, never in a group DM,
+ * so it fits `messageCreate` and the other message events.
  *
  * @param overrides - The message's content, components and the rest; see {@link MockMessageOverrides}.
  *
@@ -1249,7 +1302,7 @@ interface MockMessageOverrides {
  * @see {@link MockMessageOverrides}
  * @see {@link createMockGuild}
  */
-declare function createMockMessage(overrides?: MockMessageOverrides): DeepMocked<Message> & {
+declare function createMockMessage(overrides?: MockMessageOverrides): DeepMocked<Message> & OmitPartialGroupDMChannel<Message> & {
     deleted: boolean;
 };
 /**
@@ -1811,9 +1864,34 @@ interface ResponseReport {
     sent: boolean;
     /**
      * Every answer call the interaction got, through `respond()` or discord.js directly, in order: the payload it sent,
-     * without `withResponse`, and the `error` of one Discord refused.
+     * without `withResponse`, and the `error` of one Discord refused. Checking a call's `method` types its `payload` as
+     * that method takes it: the options of a reply, an edit or a deferral, the modal shown, or the message deleted.
      */
-    calls: readonly ResponseCall[];
+    calls: readonly ((ResponseCall & {
+        method: 'reply' | 'followUp';
+        payload?: string | MessagePayload | InteractionReplyOptions;
+    }) | (ResponseCall & {
+        method: 'update';
+        payload?: string | MessagePayload | InteractionUpdateOptions;
+    }) | (ResponseCall & {
+        method: 'editReply';
+        payload?: string | MessagePayload | InteractionEditReplyOptions;
+    }) | (ResponseCall & {
+        method: 'message.edit';
+        payload?: string | MessagePayload | MessageEditOptions;
+    }) | (ResponseCall & {
+        method: 'showModal';
+        payload?: JSONEncodable<APIModalInteractionResponseCallbackData> | ModalComponentData | APIModalInteractionResponseCallbackData;
+    }) | (ResponseCall & {
+        method: 'deferReply';
+        payload?: InteractionDeferReplyOptions;
+    }) | (ResponseCall & {
+        method: 'deferUpdate';
+        payload?: InteractionDeferUpdateOptions;
+    }) | (ResponseCall & {
+        method: 'deleteReply';
+        payload?: MessageResolvable | '@original';
+    }))[];
 }
 /**
  * Reports how an interaction was answered: where its answer stands, and every answer call it got, in order.

package/dist/types/testing/index.d.ts

@@ -1,5 +1,5 @@
 import { ServiceIdentifier, Container } from 'inversify';
-import { Client, Interaction, Message, MessageReaction, PartialMessageReaction, User, PartialUser, ClientEvents, Locale, GuildMember, Role, GuildBasedChannel, Guild, APIMessageTopLevelComponent, JSONEncodable, APIEmbed, MessageFlagsResolvable, TextBasedChannel, BaseChannel, APIAuthorizingIntegrationOwnersMap, CacheType, CommandInteractionOptionResolver, Attachment, ModalSubmitFields, DiscordAPIError } from 'discord.js';
+import { Client, Interaction, Message, MessageReaction, PartialMessageReaction, User, PartialUser, ClientEvents, Base, Locale, GuildMember, Role, GuildBasedChannel, Guild, APIMessageTopLevelComponent, JSONEncodable, APIEmbed, MessageFlagsResolvable, TextBasedChannel, BaseChannel, APIAuthorizingIntegrationOwnersMap, CacheType, CommandInteractionOptionResolver, ThreadChannel, AnyThreadChannel, ChatInputCommandInteraction, AutocompleteInteraction, MessageContextMenuCommandInteraction, UserContextMenuCommandInteraction, PrimaryEntryPointCommandInteraction, ContextMenuCommandInteraction, CommandInteraction, ButtonInteraction, StringSelectMenuInteraction, UserSelectMenuInteraction, RoleSelectMenuInteraction, MentionableSelectMenuInteraction, ChannelSelectMenuInteraction, MessageComponentInteraction, ModalSubmitInteraction, BaseInteraction, DMChannel, PartialGroupDMChannel, OmitPartialGroupDMChannel, Attachment, ModalSubmitFields, MessagePayload, InteractionReplyOptions, InteractionUpdateOptions, InteractionEditReplyOptions, MessageEditOptions, APIModalInteractionResponseCallbackData, ModalComponentData, InteractionDeferReplyOptions, InteractionDeferUpdateOptions, MessageResolvable, DiscordAPIError } from 'discord.js';
 import { ReactionHandlerAction, CommandType } from '../enum/index.js';
 import { a8 as Provider, P as ProviderToken } from '../index-D7n0FBMm.js';
 import { CooldownStore, ExecutionContextType, ExecutionContext, CooldownScope, MetadataDecorator, ResponsePhase, ResponseCall } from '../common/index.js';
@@ -678,6 +678,17 @@ declare class MeoCordTestingModule {
     static fromApp(app: new (...args: any[]) => unknown, options?: FromAppOptions): TestingModuleBuilder;
 }
 
+type Overloads<T> = T extends {
+    (...args: infer A1): infer R1;
+    (...args: infer A2): infer R2;
+    (...args: infer A3): infer R3;
+    (...args: infer A4): infer R4;
+} ? ((...args: A1) => R1) | ((...args: A2) => R2) | ((...args: A3) => R3) | ((...args: A4) => R4) : T;
+type CallArgs<T> = Parameters<Overloads<T> & ((...args: any[]) => any)>;
+type CallResult<T> = ReturnType<Overloads<T> & ((...args: any[]) => any)>;
+type Implementation<T> = {
+    fn(...args: CallArgs<T>): CallResult<T>;
+}['fn'];
 /**
  * One call's outcome, as a mock function records it: the value it returned, or the error it threw.
  *
@@ -702,13 +713,13 @@ interface MockResult<T = unknown> {
  */
 interface MockState<T extends (...args: any[]) => any = (...args: any[]) => any> {
     /** Arguments from each call, in order. */
-    readonly calls: Parameters<T>[];
+    readonly calls: CallArgs<T>[];
     /** Return / throw result from each call, in order. */
-    readonly results: MockResult<ReturnType<T>>[];
+    readonly results: MockResult<CallResult<T>>[];
     /** The `this` value recorded for each call. */
     readonly instances: any[];
     /** Arguments from the most recent call, or undefined if never called. */
-    readonly lastCall?: Parameters<T>;
+    readonly lastCall?: CallArgs<T>;
 }
 /**
  * The mock API of a mock function: what it has recorded, and the methods that change what it does.
@@ -727,21 +738,21 @@ interface MockInstance<T extends (...args: any[]) => any = (...args: any[]) => a
     /** What the mock has recorded: its calls, their outcomes and their `this`. */
     readonly mock: MockState<T>;
     /** Returns `value` from every call, until another implementation is set. */
-    mockReturnValue(value: ReturnType<T>): MockedFunction<T>;
+    mockReturnValue(value: CallResult<T>): MockedFunction<T>;
     /** Returns `value` from the next call only. */
-    mockReturnValueOnce(value: ReturnType<T>): MockedFunction<T>;
+    mockReturnValueOnce(value: CallResult<T>): MockedFunction<T>;
     /** Resolves every call to `value`. */
-    mockResolvedValue(value: Awaited<ReturnType<T>>): MockedFunction<T>;
+    mockResolvedValue(value: Awaited<CallResult<T>>): MockedFunction<T>;
     /** Resolves the next call only to `value`. */
-    mockResolvedValueOnce(value: Awaited<ReturnType<T>>): MockedFunction<T>;
+    mockResolvedValueOnce(value: Awaited<CallResult<T>>): MockedFunction<T>;
     /** Rejects every call with `value`. */
     mockRejectedValue(value: unknown): MockedFunction<T>;
     /** Rejects the next call only with `value`. */
     mockRejectedValueOnce(value: unknown): MockedFunction<T>;
     /** Runs `fn` for every call. */
-    mockImplementation(fn: T): MockedFunction<T>;
+    mockImplementation(fn: Implementation<T>): MockedFunction<T>;
     /** Runs `fn` for the next call only; `*Once` implementations run in the order they were set. */
-    mockImplementationOnce(fn: T): MockedFunction<T>;
+    mockImplementationOnce(fn: Implementation<T>): MockedFunction<T>;
     /** Forgets the recorded calls, keeping the implementation. */
     mockClear(): MockedFunction<T>;
     /** Forgets the recorded calls, and puts back the implementation the mock was created with. */
@@ -757,7 +768,8 @@ interface MockInstance<T extends (...args: any[]) => any = (...args: any[]) => a
  * A mock function with the signature of `T`, and the mock API of {@link MockInstance}.
  *
  * It takes the place of jest's `MockedFunction<T>` and Vitest's `MockedFunction<T>`. The mock factories type each
- * method of a mock with it, so `interaction.reply.mockResolvedValue(...)` type-checks.
+ * method of a mock with it, so `interaction.reply.mockResolvedValue(...)` type-checks. For an overloaded method, such as
+ * a manager's `fetch`, the mock API takes what any of its overloads takes or returns.
  *
  * @group Testing
  * @category Mocks
@@ -864,7 +876,8 @@ declare function resetAllMocks(): void;
 declare function createMockFn<T extends (...args: any[]) => any = (...args: any[]) => any>(impl?: T): MockedFunction<T>;
 
 /**
- * A mock of `T`: every method a mock function, and every nested object mocked in turn, five levels deep.
+ * A mock of `T`: every method a mock function, and every nested object mocked in turn, five levels deep, including a
+ * discord.js structure that may be absent, such as a message's `member`, when it is present.
  *
  * It is what the mock factories return. It is assignable wherever `T` is expected, and each method takes
  * `mockResolvedValue` and the rest of {@link MockInstance}.
@@ -878,7 +891,7 @@ declare function createMockFn<T extends (...args: any[]) => any = (...args: any[
  * @see {@link createMock}
  */
 type DeepMocked<T, Depth extends number[] = []> = Depth['length'] extends 5 ? T : {
-    -readonly [K in keyof T]: T[K] extends (...args: infer A) => infer R ? MockedFunction<(...args: A) => R> : T[K] extends object ? DeepMocked<T[K], [...Depth, 0]> : T[K];
+    -readonly [K in keyof T]: T[K] extends (...args: any[]) => any ? MockedFunction<T[K]> : T[K] extends object ? DeepMocked<T[K], [...Depth, 0]> : Depth extends [] ? NonNullable<T[K]> extends Base ? DeepMocked<NonNullable<T[K]>, [...Depth, 0]> | Extract<T[K], null | undefined> : T[K] : T[K];
 } & T;
 /**
  * Property values a mock factory sets as it builds the mock.
@@ -906,6 +919,14 @@ interface InteractionClass<T> {
     prototype: T;
     name: string;
 }
+type WithCache<T, C extends CacheType> = T extends ChatInputCommandInteraction<any> ? ChatInputCommandInteraction<C> : T extends AutocompleteInteraction<any> ? AutocompleteInteraction<C> : T extends MessageContextMenuCommandInteraction<any> ? MessageContextMenuCommandInteraction<C> : T extends UserContextMenuCommandInteraction<any> ? UserContextMenuCommandInteraction<C> : T extends PrimaryEntryPointCommandInteraction<any> ? PrimaryEntryPointCommandInteraction<C> : T extends ContextMenuCommandInteraction<any> ? ContextMenuCommandInteraction<C> : T extends CommandInteraction<any> ? CommandInteraction<C> : T extends ButtonInteraction<any> ? ButtonInteraction<C> : T extends StringSelectMenuInteraction<any> ? StringSelectMenuInteraction<C> : T extends UserSelectMenuInteraction<any> ? UserSelectMenuInteraction<C> : T extends RoleSelectMenuInteraction<any> ? RoleSelectMenuInteraction<C> : T extends MentionableSelectMenuInteraction<any> ? MentionableSelectMenuInteraction<C> : T extends ChannelSelectMenuInteraction<any> ? ChannelSelectMenuInteraction<C> : T extends MessageComponentInteraction<any> ? MessageComponentInteraction<C> : T extends ModalSubmitInteraction<any> ? ModalSubmitInteraction<C> : T extends BaseInteraction<any> ? BaseInteraction<C> : T;
+type OutsideServer = {
+    guild: null;
+} | {
+    member: null;
+} | {
+    channel: DMChannel | PartialGroupDMChannel;
+};
 /**
  * Creates a mock instance of a discord.js class, such as an interaction, keeping its prototype so `instanceof` holds.
  *
@@ -931,6 +952,9 @@ interface InteractionClass<T> {
  * {@link getResponse} reports every answer the interaction got. Every method is a mock function, and one that returns a
  * promise in discord.js resolves.
  *
+ * Given `guild: null`, `member: null` or a DM channel, it is typed as an interaction that may come from anywhere, so
+ * its `guild` and `member` read as possibly `null`; otherwise as one from a server the bot is in.
+ *
  * @param Class - The discord.js class to mock.
  * @param props - Values for properties the class declares `readonly`; see {@link MockProps}.
  *
@@ -952,6 +976,28 @@ interface InteractionClass<T> {
  * @see {@link https://meocord.dev/docs/4.1/mocks | Mocks}
  */
 declare function createMockInteraction<T extends object>(Class: InteractionClass<T>, props?: MockProps<T>): DeepMocked<T>;
+/**
+ * Creates a mock interaction from outside a server: one given `guild: null`, `member: null` or a DM channel, as from a
+ * direct message or a server the bot isn't in.
+ *
+ * It is typed as discord.js types an interaction that may come from anywhere, so its `guild` and `member` may be
+ * `null`. Everything else is as {@link createMockInteraction} builds it from a server.
+ *
+ * @param Class - The discord.js interaction class to mock.
+ * @param props - The interaction's properties, with `guild: null`, `member: null` or a DM `channel`; see {@link MockProps}.
+ *
+ * @example
+ * ```ts
+ * import { expect } from 'vitest'
+ *
+ * const command = createMockInteraction(ChatInputCommandInteraction, { channel: createMockChannel(DMChannel), guild: null })
+ * expect(command.inGuild()).toBe(false)
+ * ```
+ *
+ * @group Testing
+ * @category Mocks
+ */
+declare function createMockInteraction<T extends object>(Class: InteractionClass<T>, props: MockProps<WithCache<T, CacheType>> & OutsideServer): DeepMocked<WithCache<T, CacheType>>;
 /**
  * Creates a mock of any type, with no class needed, for service doubles and interfaces.
  *
@@ -1029,7 +1075,7 @@ declare const createMockUser: (props?: MockProps<User>) => DeepMocked<User>;
  * import { expect } from 'vitest'
  *
  * const client = createMockClient()
- * const botId = client.user!.id
+ * const botId = client.user.id
  * const message = createMockMessage({ content: `<@${botId}> help`, client })
  * expect(message.mentions.users.has(botId)).toBe(true)
  * ```
@@ -1038,7 +1084,7 @@ declare const createMockUser: (props?: MockProps<User>) => DeepMocked<User>;
  * @category Mocks
  * @see {@link createMockMessage}
  */
-declare function createMockClient(): DeepMocked<Client>;
+declare function createMockClient(): DeepMocked<Client<true>>;
 /**
  * What {@link createMockGuild} puts in the guild's caches, as the gateway would have filled them.
  *
@@ -1070,14 +1116,18 @@ interface MockGuildOverrides {
  *
  * @remarks
  * A manager's `fetch(id)` resolves to its cached item with that id, as discord.js looks there first, or to a new one it
- * caches under that id: a member or channel in this guild, a role with that id, or a ban; `create()` and `edit()`
- * resolve to a mock of its item, and a list fetch to an empty collection. Members, roles and channels given are put in
+ * caches under that id: a member or channel in this guild, a role with that id, or a ban. `members.fetch({ user: ids })`
+ * resolves to a collection of each of those members, found or made the same way; `create()` and `edit()` resolve to a
+ * mock of its item, and a list fetch to an empty collection. Members, roles and channels given are put in
  * their managers' caches, where dispatch looks first when it resolves a message's typed params; a member
  * {@link createMockMember} made without a server is in this one. Its `roles.everyone` is the role given with the
  * guild's id, or else an @everyone role of its own at position 0 with no permissions, in `roles.cache` as Discord has
  * it. The guild is named `'Guild'` and its `preferredLocale` is `'en-US'` unless given, so `t.forGuild(guild)`
  * translates as for a new English server.
  *
+ * The mock makes a member for any id it's asked for, so a test of an id that isn't a member rejects the fetch, as
+ * `guild.members.fetch.mockRejectedValue(createDiscordError(10007))`, or resolves a collection without that member.
+ *
  * @example
  * ```ts
  * const target = createMock<GuildMember>({ id: '111111111111111111' })
@@ -1091,6 +1141,7 @@ interface MockGuildOverrides {
  * @see {@link createMockMessage}
  */
 declare function createMockGuild(overrides?: MockGuildOverrides): DeepMocked<Guild>;
+type ChannelOf<T> = T extends ThreadChannel ? AnyThreadChannel : T;
 /**
  * Creates a mock channel of the given class, such as `TextChannel`, `ThreadChannel` or `DMChannel`.
  *
@@ -1100,7 +1151,8 @@ declare function createMockGuild(overrides?: MockGuildOverrides): DeepMocked<Gui
  * The managers the class has are ready to stub: `messages`, `threads` on text, announcement, forum and media channels,
  * and `members` on threads, each with a real, empty `cache` and the channel as its `channel`, or `thread`. A subclass gets the managers of the class it extends.
  * Type guards such as `isTextBased()`, `isDMBased()` and `isThread()` run discord.js's own logic, so each answers what
- * the channel is.
+ * the channel is. A thread is typed as discord.js types every thread it gives, a public or a private one, so it fits
+ * an interaction's `channel`, a guild's channels and the `threadCreate` event.
  *
  * @param Class - The discord.js channel class to mock.
  * @param props - Values for the channel's properties, such as its `id`, `name` or `topic`; see {@link MockProps}.
@@ -1118,7 +1170,7 @@ declare function createMockGuild(overrides?: MockGuildOverrides): DeepMocked<Gui
  * @category Mocks
  * @see {@link createMockGuild}
  */
-declare function createMockChannel<T extends BaseChannel>(Class: InteractionClass<T>, props?: MockProps<T>): DeepMocked<T>;
+declare function createMockChannel<T extends BaseChannel>(Class: InteractionClass<T>, props?: MockProps<T>): DeepMocked<ChannelOf<T>>;
 /**
  * What {@link createMockMember} builds a member with.
  *
@@ -1226,7 +1278,8 @@ interface MockMessageOverrides {
  * and `reply()` resolve to a new mock message. Without overrides the message is empty, in a server, from a new
  * person who is its `member`; with `guild: null` it is a direct message. Give `author` to send several messages as
  * one user, such as to reach a per-user cooldown. An author given, and the users, roles and channels the content
- * mentions, are cached as the gateway delivers them.
+ * mentions, are cached as the gateway delivers them. It is typed as discord.js emits a message, never in a group DM,
+ * so it fits `messageCreate` and the other message events.
  *
  * @param overrides - The message's content, components and the rest; see {@link MockMessageOverrides}.
  *
@@ -1249,7 +1302,7 @@ interface MockMessageOverrides {
  * @see {@link MockMessageOverrides}
  * @see {@link createMockGuild}
  */
-declare function createMockMessage(overrides?: MockMessageOverrides): DeepMocked<Message> & {
+declare function createMockMessage(overrides?: MockMessageOverrides): DeepMocked<Message> & OmitPartialGroupDMChannel<Message> & {
     deleted: boolean;
 };
 /**
@@ -1811,9 +1864,34 @@ interface ResponseReport {
     sent: boolean;
     /**
      * Every answer call the interaction got, through `respond()` or discord.js directly, in order: the payload it sent,
-     * without `withResponse`, and the `error` of one Discord refused.
+     * without `withResponse`, and the `error` of one Discord refused. Checking a call's `method` types its `payload` as
+     * that method takes it: the options of a reply, an edit or a deferral, the modal shown, or the message deleted.
      */
-    calls: readonly ResponseCall[];
+    calls: readonly ((ResponseCall & {
+        method: 'reply' | 'followUp';
+        payload?: string | MessagePayload | InteractionReplyOptions;
+    }) | (ResponseCall & {
+        method: 'update';
+        payload?: string | MessagePayload | InteractionUpdateOptions;
+    }) | (ResponseCall & {
+        method: 'editReply';
+        payload?: string | MessagePayload | InteractionEditReplyOptions;
+    }) | (ResponseCall & {
+        method: 'message.edit';
+        payload?: string | MessagePayload | MessageEditOptions;
+    }) | (ResponseCall & {
+        method: 'showModal';
+        payload?: JSONEncodable<APIModalInteractionResponseCallbackData> | ModalComponentData | APIModalInteractionResponseCallbackData;
+    }) | (ResponseCall & {
+        method: 'deferReply';
+        payload?: InteractionDeferReplyOptions;
+    }) | (ResponseCall & {
+        method: 'deferUpdate';
+        payload?: InteractionDeferUpdateOptions;
+    }) | (ResponseCall & {
+        method: 'deleteReply';
+        payload?: MessageResolvable | '@original';
+    }))[];
 }
 /**
  * Reports how an interaction was answered: where its answer stands, and every answer call it got, in order.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "meocord",
   "description": "Decorator-based framework for Discord bots on discord.js, with dependency injection, guards, a CLI and a testing toolkit.",
-  "version": "4.1.0",
+  "version": "4.1.2",
   "type": "module",
   "engines": {
     "node": ">=22.13"
@@ -14,6 +14,7 @@
     "prepare": "husky",
     "test": "vitest run",
     "verify:generated": "bun scripts/verify-generated.ts",
+    "verify:runners": "bun scripts/verify-runners.ts",
     "cli:scenarios": "bun scripts/cli-scenarios.ts",
     "test:e2e": "bun scripts/e2e.ts",
     "test:watch": "vitest",