discord.js 15.0.0-djs-file-upload.1761302390-5ae769c9e → 15.0.0-move-client-init.1761650119-a4c0a246f

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "discord.js",
-  "version": "15.0.0-djs-file-upload.1761302390-5ae769c9e",
+  "version": "15.0.0-move-client-init.1761650119-a4c0a246f",
   "description": "A powerful library for interacting with the Discord API",
   "main": "./src/index.js",
   "types": "./typings/index.d.ts",
@@ -61,12 +61,12 @@
     "magic-bytes.js": "^1.12.1",
     "tslib": "^2.8.1",
     "undici": "7.16.0",
-    "@discordjs/collection": "^3.0.0-djs-file-upload.1761302390-5ae769c9e",
-    "@discordjs/builders": "^2.0.0-djs-file-upload.1761302390-5ae769c9e",
-    "@discordjs/rest": "^3.0.0-djs-file-upload.1761302390-5ae769c9e",
-    "@discordjs/util": "^2.0.0-djs-file-upload.1761302390-5ae769c9e",
-    "@discordjs/formatters": "^1.0.0-djs-file-upload.1761302390-5ae769c9e",
-    "@discordjs/ws": "^3.0.0-djs-file-upload.1761302390-5ae769c9e"
+    "@discordjs/builders": "^2.0.0-move-client-init.1761650119-a4c0a246f",
+    "@discordjs/collection": "^3.0.0-move-client-init.1761650119-a4c0a246f",
+    "@discordjs/formatters": "^1.0.0-move-client-init.1761650119-a4c0a246f",
+    "@discordjs/rest": "^3.0.0-move-client-init.1761650119-a4c0a246f",
+    "@discordjs/util": "^2.0.0-move-client-init.1761650119-a4c0a246f",
+    "@discordjs/ws": "^3.0.0-move-client-init.1761650119-a4c0a246f"
   },
   "devDependencies": {
     "@favware/cliff-jumper": "^4.1.0",
@@ -83,8 +83,8 @@
     "turbo": "^2.5.8",
     "typescript": "~5.9.3",
     "@discordjs/api-extractor": "^7.52.7",
-    "@discordjs/scripts": "^0.1.0",
-    "@discordjs/docgen": "^0.12.1"
+    "@discordjs/docgen": "^0.12.1",
+    "@discordjs/scripts": "^0.1.0"
   },
   "engines": {
     "node": ">=22.12.0"

package/src/client/Client.js

@@ -346,15 +346,6 @@ class Client extends BaseClient {
     );
     this.ws.on(WebSocketShardEvents.Dispatch, this._handlePacket.bind(this));
 
-    this.ws.on(WebSocketShardEvents.Ready, async data => {
-      for (const guild of data.guilds) {
-        this.expectedGuilds.add(guild.id);
-      }
-
-      this.status = Status.WaitingForGuilds;
-      await this._checkReady();
-    });
-
     this.ws.on(WebSocketShardEvents.HeartbeatComplete, ({ heartbeatAt, latency }, shardId) => {
       this.emit(Events.Debug, `[WS => Shard ${shardId}] Heartbeat acknowledged, latency of ${latency}ms.`);
       this.lastPingTimestamps.set(shardId, heartbeatAt);
@@ -384,7 +375,9 @@ class Client extends BaseClient {
         PacketHandlers[packet.t](this, packet, shardId);
       }
 
-      if (this.status === Status.WaitingForGuilds && WaitingForGuildEvents.includes(packet.t)) {
+      if (packet.t === GatewayDispatchEvents.Ready) {
+        await this._checkReady();
+      } else if (this.status === Status.WaitingForGuilds && WaitingForGuildEvents.includes(packet.t)) {
         this.expectedGuilds.delete(packet.d.id);
         await this._checkReady();
       }

package/src/client/websocket/handlers/READY.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { ClientApplication } = require('../../../structures/ClientApplication.js');
+const { Status } = require('../../../util/Status.js');
 
 let ClientUser;
 
@@ -14,6 +15,7 @@ module.exports = (client, { d: data }, shardId) => {
   }
 
   for (const guild of data.guilds) {
+    client.expectedGuilds.add(guild.id);
     guild.shardId = shardId;
     client.guilds._add(guild);
   }
@@ -23,4 +25,6 @@ module.exports = (client, { d: data }, shardId) => {
   } else {
     client.application = new ClientApplication(client, data.application);
   }
+
+  client.status = Status.WaitingForGuilds;
 };

package/src/structures/CommandInteraction.js

@@ -96,7 +96,6 @@ class CommandInteraction extends BaseInteraction {
    * @property {Collection<Snowflake, GuildMember|APIGuildMember>} [members] The resolved guild members
    * @property {Collection<Snowflake, Role|APIRole>} [roles] The resolved roles
    * @property {Collection<Snowflake, BaseChannel|APIChannel>} [channels] The resolved channels
-   * @property {Collection<Snowflake, Attachment>} [attachments] The resolved attachments
    */
 
   /**
@@ -104,6 +103,7 @@ class CommandInteraction extends BaseInteraction {
    *
    * @typedef {BaseInteractionResolvedData} CommandInteractionResolvedData
    * @property {Collection<Snowflake, Message|APIMessage>} [messages] The resolved messages
+   * @property {Collection<Snowflake, Attachment>} [attachments] The resolved attachments
    */
 
   /**

package/src/structures/ModalComponentResolver.js

@@ -222,17 +222,6 @@ class ModalComponentResolver {
 
     return null;
   }
-
-  /**
-   * Gets file upload component
-   *
-   * @param {string} customId The custom id of the component
-   * @param {boolean} [required=false] Whether to throw an error if the component value is not found or empty
-   * @returns {?Collection<string, Attachment>} The uploaded files, or null if none were uploaded and not required
-   */
-  getUploadedFiles(customId, required = false) {
-    return this._getTypedComponent(customId, [ComponentType.FileUpload], ['attachments'], required).attachments ?? null;
-  }
 }
 
 exports.ModalComponentResolver = ModalComponentResolver;

package/src/structures/ModalSubmitInteraction.js

@@ -9,7 +9,6 @@ const { ModalComponentResolver } = require('./ModalComponentResolver.js');
 const { InteractionResponses } = require('./interfaces/InteractionResponses.js');
 
 const getMessage = lazy(() => require('./Message.js').Message);
-const getAttachment = lazy(() => require('./Attachment.js').Attachment);
 
 /**
  * @typedef {Object} BaseModalData
@@ -27,13 +26,6 @@ const getAttachment = lazy(() => require('./Attachment.js').Attachment);
  * @property {Collection<string, BaseChannel|APIChannel>} [channels] The resolved channels
  */
 
-/**
- * @typedef {BaseModalData} FileUploadModalData
- * @property {string} customId The custom id of the file upload
- * @property {string[]} values The values of the file upload
- * @property {Collection<string, Attachment>} [attachments] The resolved attachments
- */
-
 /**
  * @typedef {BaseModalData} TextInputModalData
  * @property {string} customId The custom id of the component
@@ -45,7 +37,7 @@ const getAttachment = lazy(() => require('./Attachment.js').Attachment);
  */
 
 /**
- * @typedef {SelectMenuModalData|TextInputModalData|FileUploadModalData} ModalData
+ * @typedef {SelectMenuModalData|TextInputModalData} ModalData
  */
 
 /**
@@ -163,7 +155,7 @@ class ModalSubmitInteraction extends BaseInteraction {
     if (rawComponent.values) {
       data.values = rawComponent.values;
       if (resolved) {
-        const { members, users, channels, roles, attachments } = resolved;
+        const { members, users, channels, roles } = resolved;
         const valueSet = new Set(rawComponent.values);
 
         if (users) {
@@ -206,15 +198,6 @@ class ModalSubmitInteraction extends BaseInteraction {
             }
           }
         }
-
-        if (attachments) {
-          data.attachments = new Collection();
-          for (const [id, attachment] of Object.entries(attachments)) {
-            if (valueSet.has(id)) {
-              data.attachments.set(id, new (getAttachment())(attachment));
-            }
-          }
-        }
       }
     }
 

package/src/util/Components.js

@@ -24,7 +24,7 @@ const { ComponentType } = require('discord-api-types/v10');
 
 /**
  * @typedef {StringSelectMenuComponentData|TextInputComponentData|UserSelectMenuComponentData|
- * RoleSelectMenuComponentData|MentionableSelectMenuComponentData|ChannelSelectMenuComponentData|FileUploadComponentData} ComponentInLabelData
+ * RoleSelectMenuComponentData|MentionableSelectMenuComponentData|ChannelSelectMenuComponentData} ComponentInLabelData
  */
 
 /**
@@ -44,14 +44,6 @@ const { ComponentType } = require('discord-api-types/v10');
  * @property {string} [url] The URL of the button
  */
 
-/**
- * @typedef {BaseComponentData} FileUploadComponentData
- * @property {string} customId The custom id of the file upload
- * @property {number} [minValues] The minimum number of files that can be uploaded (0-10)
- * @property {number} [maxValues] The maximum number of files that can be uploaded (1-10)
- * @property {boolean} [required] Whether this component is required in modals
- */
-
 /**
  * @typedef {BaseComponentData} BaseSelectMenuComponentData
  * @property {string} customId The custom id of the select menu

package/typings/index.d.mts

@@ -274,13 +274,11 @@ export interface ActionRowData<ComponentType extends ActionRowComponentData | JS
 
 export type ComponentInLabelData =
   | ChannelSelectMenuComponentData
-  | FileUploadComponentData
   | MentionableSelectMenuComponentData
   | RoleSelectMenuComponentData
   | StringSelectMenuComponentData
   | TextInputComponentData
   | UserSelectMenuComponentData;
-
 export interface LabelData extends BaseComponentData {
   component: ComponentInLabelData;
   description?: string;
@@ -2582,12 +2580,7 @@ export interface SelectMenuModalData<Cached extends CacheType = CacheType>
   values: readonly string[];
 }
 
-export interface FileUploadModalData extends BaseModalData<ComponentType.FileUpload> {
-  customId: string;
-  files: readonly Attachment[];
-}
-
-export type ModalData = FileUploadModalData | SelectMenuModalData | TextInputModalData;
+export type ModalData = SelectMenuModalData | TextInputModalData;
 
 export interface LabelModalData extends BaseModalData<ComponentType.Label> {
   component: readonly ModalData[];
@@ -2660,8 +2653,6 @@ export class ModalComponentResolver<Cached extends CacheType = CacheType> {
 
   public getSelectedMentionables(customId: string, required: true): ModalSelectedMentionables<Cached>;
   public getSelectedMentionables(customId: string, required?: boolean): ModalSelectedMentionables<Cached> | null;
-  public getUploadedFiles(customId: string, required: true): ReadonlyCollection<string, Attachment>;
-  public getUploadedFiles(customId: string, required?: boolean): ReadonlyCollection<string, Attachment> | null;
 }
 
 export interface ModalMessageModalSubmitInteraction<Cached extends CacheType = CacheType>
@@ -5630,7 +5621,6 @@ export interface CommandInteractionOption<Cached extends CacheType = CacheType>
 }
 
 export interface BaseInteractionResolvedData<Cached extends CacheType = CacheType> {
-  attachments?: ReadonlyCollection<Snowflake, Attachment>;
   channels?: ReadonlyCollection<Snowflake, CacheTypeReducer<Cached, Channel, APIInteractionDataResolvedChannel>>;
   members?: ReadonlyCollection<Snowflake, CacheTypeReducer<Cached, GuildMember, APIInteractionDataResolvedGuildMember>>;
   roles?: ReadonlyCollection<Snowflake, CacheTypeReducer<Cached, Role, APIRole>>;
@@ -5639,6 +5629,7 @@ export interface BaseInteractionResolvedData<Cached extends CacheType = CacheTyp
 
 export interface CommandInteractionResolvedData<Cached extends CacheType = CacheType>
   extends BaseInteractionResolvedData<Cached> {
+  attachments?: ReadonlyCollection<Snowflake, Attachment>;
   messages?: ReadonlyCollection<Snowflake, CacheTypeReducer<Cached, Message, APIMessage>>;
 }
 
@@ -6847,14 +6838,6 @@ export interface TextInputComponentData extends BaseComponentData {
   value?: string;
 }
 
-export interface FileUploadComponentData extends BaseComponentData {
-  customId: string;
-  maxValues?: number;
-  minValues?: number;
-  required?: number;
-  type: ComponentType.FileUpload;
-}
-
 export type MessageTarget =
   | ChannelManager
   | Interaction

package/typings/index.d.ts

@@ -274,13 +274,11 @@ export interface ActionRowData<ComponentType extends ActionRowComponentData | JS
 
 export type ComponentInLabelData =
   | ChannelSelectMenuComponentData
-  | FileUploadComponentData
   | MentionableSelectMenuComponentData
   | RoleSelectMenuComponentData
   | StringSelectMenuComponentData
   | TextInputComponentData
   | UserSelectMenuComponentData;
-
 export interface LabelData extends BaseComponentData {
   component: ComponentInLabelData;
   description?: string;
@@ -2582,12 +2580,7 @@ export interface SelectMenuModalData<Cached extends CacheType = CacheType>
   values: readonly string[];
 }
 
-export interface FileUploadModalData extends BaseModalData<ComponentType.FileUpload> {
-  customId: string;
-  files: readonly Attachment[];
-}
-
-export type ModalData = FileUploadModalData | SelectMenuModalData | TextInputModalData;
+export type ModalData = SelectMenuModalData | TextInputModalData;
 
 export interface LabelModalData extends BaseModalData<ComponentType.Label> {
   component: readonly ModalData[];
@@ -2660,8 +2653,6 @@ export class ModalComponentResolver<Cached extends CacheType = CacheType> {
 
   public getSelectedMentionables(customId: string, required: true): ModalSelectedMentionables<Cached>;
   public getSelectedMentionables(customId: string, required?: boolean): ModalSelectedMentionables<Cached> | null;
-  public getUploadedFiles(customId: string, required: true): ReadonlyCollection<string, Attachment>;
-  public getUploadedFiles(customId: string, required?: boolean): ReadonlyCollection<string, Attachment> | null;
 }
 
 export interface ModalMessageModalSubmitInteraction<Cached extends CacheType = CacheType>
@@ -5630,7 +5621,6 @@ export interface CommandInteractionOption<Cached extends CacheType = CacheType>
 }
 
 export interface BaseInteractionResolvedData<Cached extends CacheType = CacheType> {
-  attachments?: ReadonlyCollection<Snowflake, Attachment>;
   channels?: ReadonlyCollection<Snowflake, CacheTypeReducer<Cached, Channel, APIInteractionDataResolvedChannel>>;
   members?: ReadonlyCollection<Snowflake, CacheTypeReducer<Cached, GuildMember, APIInteractionDataResolvedGuildMember>>;
   roles?: ReadonlyCollection<Snowflake, CacheTypeReducer<Cached, Role, APIRole>>;
@@ -5639,6 +5629,7 @@ export interface BaseInteractionResolvedData<Cached extends CacheType = CacheTyp
 
 export interface CommandInteractionResolvedData<Cached extends CacheType = CacheType>
   extends BaseInteractionResolvedData<Cached> {
+  attachments?: ReadonlyCollection<Snowflake, Attachment>;
   messages?: ReadonlyCollection<Snowflake, CacheTypeReducer<Cached, Message, APIMessage>>;
 }
 
@@ -6847,14 +6838,6 @@ export interface TextInputComponentData extends BaseComponentData {
   value?: string;
 }
 
-export interface FileUploadComponentData extends BaseComponentData {
-  customId: string;
-  maxValues?: number;
-  minValues?: number;
-  required?: number;
-  type: ComponentType.FileUpload;
-}
-
 export type MessageTarget =
   | ChannelManager
   | Interaction