oceanic.js 1.7.1 → 1.7.2-dev.02fa4da

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (92) hide show
  1. package/dist/lib/Client.d.ts +9 -8
  2. package/dist/lib/Client.js +18 -10
  3. package/dist/lib/Constants.d.ts +23 -16
  4. package/dist/lib/Constants.js +20 -16
  5. package/dist/lib/gateway/Shard.d.ts +1 -1
  6. package/dist/lib/gateway/Shard.js +35 -37
  7. package/dist/lib/index.d.ts +3 -0
  8. package/dist/lib/index.js +9 -3
  9. package/dist/lib/rest/RESTManager.d.ts +2 -2
  10. package/dist/lib/rest/RESTManager.js +3 -3
  11. package/dist/lib/rest/RequestHandler.js +7 -2
  12. package/dist/lib/routes/ApplicationCommands.d.ts +16 -1
  13. package/dist/lib/routes/ApplicationCommands.js +18 -3
  14. package/dist/lib/routes/Channels.d.ts +76 -6
  15. package/dist/lib/routes/Channels.js +80 -13
  16. package/dist/lib/routes/Guilds.d.ts +115 -10
  17. package/dist/lib/routes/Guilds.js +146 -44
  18. package/dist/lib/routes/Interactions.d.ts +10 -2
  19. package/dist/lib/routes/Interactions.js +10 -2
  20. package/dist/lib/routes/Miscellaneous.d.ts +8 -2
  21. package/dist/lib/routes/Miscellaneous.js +11 -5
  22. package/dist/lib/routes/OAuth.d.ts +17 -4
  23. package/dist/lib/routes/OAuth.js +17 -4
  24. package/dist/lib/routes/Users.d.ts +7 -5
  25. package/dist/lib/routes/Users.js +7 -5
  26. package/dist/lib/routes/Webhooks.d.ts +16 -2
  27. package/dist/lib/routes/Webhooks.js +16 -17
  28. package/dist/lib/structures/AnnouncementChannel.d.ts +5 -2
  29. package/dist/lib/structures/AnnouncementChannel.js +6 -6
  30. package/dist/lib/structures/Application.d.ts +1 -1
  31. package/dist/lib/structures/Application.js +2 -2
  32. package/dist/lib/structures/CategoryChannel.d.ts +5 -4
  33. package/dist/lib/structures/CategoryChannel.js +6 -4
  34. package/dist/lib/structures/Channel.js +5 -1
  35. package/dist/lib/structures/CommandInteraction.d.ts +2 -2
  36. package/dist/lib/structures/CommandInteraction.js +2 -2
  37. package/dist/lib/structures/ComponentInteraction.d.ts +2 -2
  38. package/dist/lib/structures/ComponentInteraction.js +2 -2
  39. package/dist/lib/structures/ForumChannel.d.ts +5 -94
  40. package/dist/lib/structures/ForumChannel.js +5 -223
  41. package/dist/lib/structures/GroupChannel.d.ts +1 -1
  42. package/dist/lib/structures/GroupChannel.js +7 -11
  43. package/dist/lib/structures/Guild.d.ts +17 -17
  44. package/dist/lib/structures/Guild.js +35 -31
  45. package/dist/lib/structures/MediaChannel.d.ts +11 -0
  46. package/dist/lib/structures/MediaChannel.js +19 -0
  47. package/dist/lib/structures/Member.d.ts +1 -1
  48. package/dist/lib/structures/Member.js +1 -1
  49. package/dist/lib/structures/Message.d.ts +4 -2
  50. package/dist/lib/structures/Message.js +20 -12
  51. package/dist/lib/structures/ModalSubmitInteraction.d.ts +2 -2
  52. package/dist/lib/structures/ModalSubmitInteraction.js +2 -2
  53. package/dist/lib/structures/PrivateChannel.d.ts +1 -1
  54. package/dist/lib/structures/PrivateChannel.js +1 -1
  55. package/dist/lib/structures/TextChannel.js +2 -3
  56. package/dist/lib/structures/TextableChannel.d.ts +2 -2
  57. package/dist/lib/structures/TextableChannel.js +1 -1
  58. package/dist/lib/structures/TextableVoiceChannel.d.ts +2 -2
  59. package/dist/lib/structures/TextableVoiceChannel.js +2 -2
  60. package/dist/lib/structures/ThreadChannel.d.ts +1 -1
  61. package/dist/lib/structures/ThreadChannel.js +1 -1
  62. package/dist/lib/structures/ThreadOnlyChannel.d.ts +99 -0
  63. package/dist/lib/structures/ThreadOnlyChannel.js +233 -0
  64. package/dist/lib/structures/ThreadableChannel.d.ts +5 -7
  65. package/dist/lib/structures/ThreadableChannel.js +7 -6
  66. package/dist/lib/structures/User.d.ts +9 -2
  67. package/dist/lib/structures/User.js +15 -6
  68. package/dist/lib/types/channels.d.ts +57 -32
  69. package/dist/lib/types/client.d.ts +20 -6
  70. package/dist/lib/types/events.d.ts +2 -2
  71. package/dist/lib/types/gateway.d.ts +1 -1
  72. package/dist/lib/types/guilds.d.ts +2 -0
  73. package/dist/lib/types/interactions.d.ts +46 -22
  74. package/dist/lib/types/json.d.ts +23 -16
  75. package/dist/lib/types/misc.d.ts +3 -0
  76. package/dist/lib/types/request-handler.d.ts +2 -0
  77. package/dist/lib/util/Errors.d.ts +1 -1
  78. package/dist/lib/util/Errors.js +2 -2
  79. package/dist/lib/util/InteractionOptionsWrapper.d.ts +3 -3
  80. package/dist/lib/util/InteractionOptionsWrapper.js +3 -4
  81. package/dist/lib/util/SelectMenuValuesWrapper.d.ts +3 -3
  82. package/dist/lib/util/SelectMenuValuesWrapper.js +5 -6
  83. package/dist/lib/util/SimpleCollection.d.ts +12 -0
  84. package/dist/lib/util/SimpleCollection.js +81 -0
  85. package/dist/lib/util/TypedCollection.d.ts +13 -5
  86. package/dist/lib/util/TypedCollection.js +19 -6
  87. package/dist/lib/util/Util.d.ts +4 -2
  88. package/dist/lib/util/Util.js +37 -18
  89. package/dist/package.json +22 -20
  90. package/esm.mjs +6 -0
  91. package/package.json +22 -20
  92. package/patches/typedoc-plugin-merge-modules@5.0.1.patch +26 -0
@@ -1,12 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.is = void 0;
4
3
  const tslib_1 = require("tslib");
5
4
  /** @module Util */
6
5
  const Routes_1 = require("./Routes");
7
6
  const Constants_1 = require("../Constants");
8
7
  const Member_1 = tslib_1.__importDefault(require("../structures/Member"));
9
8
  const Channel_1 = tslib_1.__importDefault(require("../structures/Channel"));
9
+ const Message_1 = tslib_1.__importDefault(require("../structures/Message"));
10
10
  /** A general set of utilities. These are intentionally poorly documented, as they serve almost no usefulness to outside developers. */
11
11
  class Util {
12
12
  static BASE64URL_REGEX = /^data:image\/(?:jpeg|png|gif);base64,(?:[\d+/A-Za-z]{4})*(?:[\d+/A-Za-z]{2}(==)?|[\d+/A-Za-z]{3}=?)?$/;
@@ -170,6 +170,18 @@ class Util {
170
170
  components: row.components.map(component => this.componentToRaw(component))
171
171
  }));
172
172
  }
173
+ convertEmoji(raw) {
174
+ return {
175
+ animated: raw.animated,
176
+ available: raw.available,
177
+ id: raw.id,
178
+ managed: raw.managed,
179
+ name: raw.name,
180
+ requireColons: raw.require_colons,
181
+ roles: raw.roles,
182
+ user: raw.user ? this.#client.users.update(raw.user) : undefined
183
+ };
184
+ }
173
185
  convertImage(img) {
174
186
  if (Buffer.isBuffer(img)) {
175
187
  const b64 = img.toString("base64");
@@ -367,15 +379,25 @@ class Util {
367
379
  };
368
380
  }
369
381
  updateChannel(channelData) {
370
- if (channelData.guild_id) {
382
+ guild: if (channelData.guild_id) {
371
383
  const guild = this.#client.guilds.get(channelData.guild_id);
372
384
  if (guild) {
373
- this.#client.channelGuildMap[channelData.id] = channelData.guild_id;
374
- const channel = guild.channels.has(channelData.id) ? guild.channels.update(channelData) : guild.channels.add(Channel_1.default.from(channelData, this.#client));
375
- return channel;
385
+ if (Constants_1.ThreadChannelTypes.includes(channelData.type)) {
386
+ if (!channelData.parent_id) {
387
+ break guild;
388
+ }
389
+ return (guild.threads.has(channelData.id) ? guild.threads.update(channelData) : guild.threads.add(Channel_1.default.from(channelData, this.#client)));
390
+ }
391
+ else {
392
+ return guild.channels.update(channelData);
393
+ }
376
394
  }
377
395
  }
378
- return Channel_1.default.from(channelData, this.#client);
396
+ switch (channelData.type) {
397
+ case Constants_1.ChannelTypes.DM: return this.#client.privateChannels.update(channelData);
398
+ case Constants_1.ChannelTypes.GROUP_DM: return this.#client.groupChannels.update(channelData);
399
+ default: return Channel_1.default.from(channelData, this.#client);
400
+ }
379
401
  }
380
402
  updateMember(guildID, memberID, member) {
381
403
  const guild = this.#client.guilds.get(guildID);
@@ -390,23 +412,20 @@ class Util {
390
412
  }
391
413
  return guild ? guild.members.update({ ...member, id: memberID }, guildID) : new Member_1.default({ ...member, id: memberID }, this.#client, guildID);
392
414
  }
415
+ updateMessage(data) {
416
+ const channel = this.#client.getChannel(data.channel_id);
417
+ if (channel && "messages" in channel) {
418
+ return channel.messages.update(data);
419
+ }
420
+ return new Message_1.default(data, this.#client);
421
+ }
393
422
  updateThread(threadData) {
394
423
  const guild = this.#client.guilds.get(threadData.guild_id);
395
424
  if (guild) {
396
- this.#client.threadGuildMap[threadData.id] = threadData.guild_id;
397
- const thread = guild.threads.has(threadData.id) ? guild.threads.update(threadData) : guild.threads.add(Channel_1.default.from(threadData, this.#client));
398
- const channel = guild.channels.get(threadData.parent_id);
399
- if (channel && "threads" in channel) {
400
- channel.threads.update(thread);
401
- }
402
- return thread;
425
+ return guild.threads.update(threadData);
403
426
  }
404
427
  return Channel_1.default.from(threadData, this.#client);
405
428
  }
406
429
  }
407
430
  exports.default = Util;
408
- function is(input) {
409
- return true;
410
- }
411
- exports.is = is;
412
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Util.js","sourceRoot":"","sources":["../../../lib/util/Util.ts"],"names":[],"mappings":";;;;AAAA,mBAAmB;AACnB,qCAAmC;AAEnC,4CAOsB;AAyBtB,0EAA0C;AAC1C,4EAA4C;AAG5C,uIAAuI;AACvI,MAAqB,IAAI;IACrB,MAAM,CAAC,eAAe,GAAG,uGAAuG,CAAC;IACjI,OAAO,CAAS;IAEhB,YAAY,MAAc;QACtB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IAC1B,CAAC;IAID,MAAM,CAAC,SAAS,CAAC,MAAkC;QAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QACtF,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClD,CAAC;IAID,MAAM,CAAC,oBAAoB,CAAC,UAA4D;QACpF,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;QACtG,OAAO,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC;IAID,MAAM,CAAC,kBAAkB,CAAC,UAAwD;QAC9E,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;QACtG,OAAO,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,0EAA0E;IAC1E,aAAa,CAAC,KAAsB,EAAE,IAAY;QAC9C,IAAI;YACA,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;SACnC;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,IAAI,SAAS,CAAC,WAAW,IAAI,0EAA0E,EAAE,EAAE,KAAK,EAAE,GAAY,EAAE,CAAC,CAAC;SAC3I;IACL,CAAC;IAED,6CAA6C;IAC7C,SAAS,CAAC,IAAqD,EAAE,EAAW;QACxE,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACzB,OAAO,GAAG,CAAC;SACd;QACD,OAAO,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,OAAO,IAAI,QAAQ,CAAC;IAC/E,CAAC;IAED,SAAS,CAAC,MAAwC,EAAE,YAAY,GAAG,QAAQ;QACvE,IAAI,MAAM,KAAK,SAAS,EAAE;YACtB,OAAO,YAAY,CAAC;SACvB;QAED,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YAC5B,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,EAAE,CAAC;SAC/C;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,iBAAiB,CAAyB,SAAY;QAClD,QAAQ,SAAS,CAAC,IAAI,EAAE;YACpB,KAAK,0BAAc,CAAC,MAAM,CAAC,CAAC;gBACxB,OAAO,CAAC,SAAS,CAAC,KAAK,KAAK,wBAAY,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;oBACxD,QAAQ,EAAE,SAAS,CAAC,SAAS;oBAC7B,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,KAAK,EAAK,SAAS,CAAC,KAAK;oBACzB,KAAK,EAAK,SAAS,CAAC,KAAK;oBACzB,KAAK,EAAK,SAAS,CAAC,KAAK;oBACzB,IAAI,EAAM,SAAS,CAAC,IAAI;iBAC3B,CAAU,CAAC;aACf;YACD,KAAK,0BAAc,CAAC,UAAU,CAAC,CAAC;gBAC5B,OAAO;oBACH,QAAQ,EAAK,SAAS,CAAC,SAAS;oBAChC,KAAK,EAAQ,SAAS,CAAC,KAAK;oBAC5B,SAAS,EAAI,SAAS,CAAC,UAAU;oBACjC,SAAS,EAAI,SAAS,CAAC,UAAU;oBACjC,WAAW,EAAE,SAAS,CAAC,WAAW;oBAClC,QAAQ,EAAK,SAAS,CAAC,QAAQ;oBAC/B,KAAK,EAAQ,SAAS,CAAC,KAAK;oBAC5B,IAAI,EAAS,SAAS,CAAC,IAAI;oBAC3B,KAAK,EAAQ,SAAS,CAAC,KAAK;iBACtB,CAAC;aACd;YACD,KAAK,0BAAc,CAAC,aAAa,CAAC;YAClC,KAAK,0BAAc,CAAC,WAAW,CAAC;YAChC,KAAK,0BAAc,CAAC,WAAW,CAAC;YAChC,KAAK,0BAAc,CAAC,kBAAkB,CAAC;YACvC,KAAK,0BAAc,CAAC,cAAc,CAAC,CAAC;gBAChC,MAAM,eAAe,GAAG;oBACpB,QAAQ,EAAK,SAAS,CAAC,SAAS;oBAChC,QAAQ,EAAK,SAAS,CAAC,QAAQ;oBAC/B,SAAS,EAAI,SAAS,CAAC,UAAU;oBACjC,SAAS,EAAI,SAAS,CAAC,UAAU;oBACjC,WAAW,EAAE,SAAS,CAAC,WAAW;oBAClC,IAAI,EAAS,SAAS,CAAC,IAAI;iBAC9B,CAAC;gBAEF,IAAI,SAAS,CAAC,IAAI,KAAK,0BAAc,CAAC,aAAa,EAAE;oBACjD,OAAO,EAAE,GAAG,eAAe,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAW,CAAC;iBACtE;qBAAM,IAAI,SAAS,CAAC,IAAI,KAAK,0BAAc,CAAC,cAAc,EAAE;oBACzD,OAAO,EAAE,GAAG,eAAe,EAAE,YAAY,EAAE,SAAS,CAAC,aAAa,EAAW,CAAC;iBACjF;qBAAM;oBACH,OAAO,eAAwB,CAAC;iBACnC;aACJ;YACD,OAAO,CAAC,CAAC;gBACL,OAAO,SAAkB,CAAC;aAC7B;SACJ;IACL,CAAC;IAED,cAAc,CAAsB,SAAY;QAC5C,QAAQ,SAAS,CAAC,IAAI,EAAE;YACpB,KAAK,0BAAc,CAAC,MAAM,CAAC,CAAC;gBACxB,OAAO,CAAC,SAAS,CAAC,KAAK,KAAK,wBAAY,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;oBACxD,SAAS,EAAE,SAAS,CAAC,QAAQ;oBAC7B,QAAQ,EAAG,SAAS,CAAC,QAAQ;oBAC7B,KAAK,EAAM,SAAS,CAAC,KAAK;oBAC1B,KAAK,EAAM,SAAS,CAAC,KAAK;oBAC1B,KAAK,EAAM,SAAS,CAAC,KAAK;oBAC1B,IAAI,EAAO,SAAS,CAAC,IAAI;iBAC5B,CAAU,CAAC;aACf;YACD,KAAK,0BAAc,CAAC,UAAU,CAAC,CAAC;gBAC5B,OAAO;oBACH,SAAS,EAAI,SAAS,CAAC,QAAQ;oBAC/B,KAAK,EAAQ,SAAS,CAAC,KAAK;oBAC5B,UAAU,EAAG,SAAS,CAAC,SAAS;oBAChC,UAAU,EAAG,SAAS,CAAC,SAAS;oBAChC,WAAW,EAAE,SAAS,CAAC,WAAW;oBAClC,QAAQ,EAAK,SAAS,CAAC,QAAQ;oBAC/B,KAAK,EAAQ,SAAS,CAAC,KAAK;oBAC5B,IAAI,EAAS,SAAS,CAAC,IAAI;oBAC3B,KAAK,EAAQ,SAAS,CAAC,KAAK;iBACtB,CAAC;aACd;YACD,KAAK,0BAAc,CAAC,aAAa,CAAC;YAClC,KAAK,0BAAc,CAAC,WAAW,CAAC;YAChC,KAAK,0BAAc,CAAC,WAAW,CAAC;YAChC,KAAK,0BAAc,CAAC,kBAAkB,CAAC;YACvC,KAAK,0BAAc,CAAC,cAAc,CAAC,CAAC;gBAChC,MAAM,YAAY,GAAG;oBACjB,SAAS,EAAI,SAAS,CAAC,QAAQ;oBAC/B,QAAQ,EAAK,SAAS,CAAC,QAAQ;oBAC/B,UAAU,EAAG,SAAS,CAAC,SAAS;oBAChC,UAAU,EAAG,SAAS,CAAC,SAAS;oBAChC,WAAW,EAAE,SAAS,CAAC,WAAW;oBAClC,IAAI,EAAS,SAAS,CAAC,IAAI;iBAC9B,CAAC;gBAEF,IAAI,SAAS,CAAC,IAAI,KAAK,0BAAc,CAAC,aAAa,EAAE;oBACjD,OAAO,EAAE,GAAG,YAAY,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAW,CAAC;iBACnE;qBAAM,IAAI,SAAS,CAAC,IAAI,KAAK,0BAAc,CAAC,cAAc,EAAE;oBACzD,OAAO,EAAE,GAAG,YAAY,EAAE,aAAa,EAAE,SAAS,CAAC,YAAY,EAAW,CAAC;iBAC9E;qBAAM;oBACH,OAAO,YAAqB,CAAC;iBAChC;aACJ;YACD,OAAO,CAAC,CAAC;gBACL,OAAO,SAAkB,CAAC;aAC7B;SACJ;IACL,CAAC;IAED,kBAAkB,CAAoD,UAAoB;QACtF,OAAO,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC1B,IAAI,EAAQ,GAAG,CAAC,IAAI;YACpB,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;SACjF,CAAC,CAAU,CAAC;IACjB,CAAC;IAED,eAAe,CAA8C,UAAoB;QAC7E,OAAO,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC1B,IAAI,EAAQ,GAAG,CAAC,IAAI;YACpB,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;SAC9E,CAAC,CAAU,CAAC;IACjB,CAAC;IAED,YAAY,CAAC,GAAoB;QAC7B,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACtB,MAAM,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACnC,IAAI,IAAwB,CAAC;YAC7B,MAAM,QAAQ,GAAyC;gBACnD,cAAc;gBACd,CAAC,WAAW,EAAE,WAAW,CAAC;gBAC1B,cAAc;gBACd,CAAC,WAAW,EAAE,WAAW,CAAC;gBAC1B,WAAW;gBACX,CAAC,YAAY,EAAE,SAAS,CAAC;gBACzB,sCAAsC;gBACtC,CAAC,YAAY,EAAE,wBAAwB,CAAC;gBACxC,6EAA6E;gBAC7E,CAAC,kBAAkB,EAAE,cAAc,CAAC;aACvC,CAAC;YACF,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE;gBAC3B,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE;oBACxC,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;oBACjB,MAAM;iBACT;aACJ;YACD,IAAI,CAAC,IAAI,EAAE;gBACP,MAAM,IAAI,SAAS,CAAC,6CAA6C,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;aAC/F;YACD,GAAG,GAAG,QAAQ,IAAI,WAAW,GAAG,EAAE,CAAC;SACtC;QACD,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACjC,MAAM,IAAI,SAAS,CAAC,uFAAuF,CAAC,CAAC;SAChH;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAED,cAAc,CAAC,GAAe;QAC1B,OAAO;YACH,KAAK,EAAQ,GAAG,CAAC,KAAK;YACtB,SAAS,EAAI,GAAG,CAAC,SAAS;YAC1B,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,UAAU,EAAG,GAAG,CAAC,WAAW;YAC5B,OAAO,EAAM,GAAG,CAAC,QAAQ;YACzB,EAAE,EAAW,GAAG,CAAC,EAAE;YACnB,IAAI,EAAS,GAAG,CAAC,IAAI;YACrB,MAAM,EAAO,GAAG,CAAC,OAAO;YACxB,SAAS,EAAI,GAAG,CAAC,UAAU;YAC3B,IAAI,EAAS,GAAG,CAAC,IAAI;YACrB,IAAI,EAAS,GAAG,CAAC,IAAI;YACrB,IAAI,EAAS,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;SAC1E,CAAC;IACN,CAAC;IAED,cAAc,CAAC,MAAuB;QAClC,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACxB,MAAM,EAAE,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC7C,IAAI,EAAU,KAAK,CAAC,MAAM,CAAC,IAAI;gBAC/B,OAAO,EAAO,KAAK,CAAC,MAAM,CAAC,QAAQ;gBACnC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,cAAc;aAC5C;YACD,KAAK,EAAQ,KAAK,CAAC,KAAK;YACxB,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,MAAM,EAAO,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACrC,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,IAAI,EAAI,KAAK,CAAC,IAAI;gBAClB,KAAK,EAAG,KAAK,CAAC,KAAK;aACtB,CAAC,CAAC;YACH,MAAM,EAAE,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC7C,IAAI,EAAU,KAAK,CAAC,MAAM,CAAC,IAAI;gBAC/B,OAAO,EAAO,KAAK,CAAC,MAAM,CAAC,QAAQ;gBACnC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,cAAc;aAC5C;YACD,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,KAAK,EAAM,KAAK,CAAC,KAAK;YACtB,KAAK,EAAM,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC/C,GAAG,EAAO,KAAK,CAAC,KAAK,CAAC,GAAG;gBACzB,MAAM,EAAI,KAAK,CAAC,KAAK,CAAC,MAAM;gBAC5B,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS;gBAC/B,KAAK,EAAK,KAAK,CAAC,KAAK,CAAC,KAAK;aAC9B;YACD,QAAQ,EAAE,KAAK,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBACjD,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI;gBACzB,GAAG,EAAG,KAAK,CAAC,QAAQ,CAAC,GAAG;aAC3B;YACD,SAAS,EAAE,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBACnD,GAAG,EAAO,KAAK,CAAC,SAAS,CAAC,GAAG;gBAC7B,MAAM,EAAI,KAAK,CAAC,SAAS,CAAC,MAAM;gBAChC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,SAAS;gBACnC,KAAK,EAAK,KAAK,CAAC,SAAS,CAAC,KAAK;aAClC;YACD,GAAG,EAAI,KAAK,CAAC,GAAG;YAChB,IAAI,EAAG,KAAK,CAAC,IAAI;YACjB,KAAK,EAAE,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC3C,MAAM,EAAI,KAAK,CAAC,KAAK,CAAC,MAAM;gBAC5B,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS;gBAC/B,GAAG,EAAO,KAAK,CAAC,KAAK,CAAC,GAAG;gBACzB,KAAK,EAAK,KAAK,CAAC,KAAK,CAAC,KAAK;aAC9B;SACJ,CAAC,CAAC,CAAC;IACR,CAAC;IAED,WAAW,CAAC,MAA2B;QACnC,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACxB,MAAM,EAAE,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAE;gBAC9C,IAAI,EAAM,KAAK,CAAC,MAAM,CAAC,IAAI;gBAC3B,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO;gBAC9B,GAAG,EAAO,KAAK,CAAC,MAAM,CAAC,GAAG;aAC7B;YACD,KAAK,EAAQ,KAAK,CAAC,KAAK;YACxB,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,MAAM,EAAO,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACrC,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,IAAI,EAAI,KAAK,CAAC,IAAI;gBAClB,KAAK,EAAG,KAAK,CAAC,KAAK;aACtB,CAAC,CAAC;YACH,MAAM,EAAE,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC7C,IAAI,EAAM,KAAK,CAAC,MAAM,CAAC,IAAI;gBAC3B,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO;aACjC;YACD,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,KAAK,EAAM,KAAK,CAAC,KAAK;YACtB,KAAK,EAAM,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE;YAC3E,SAAS,EAAE,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;YACnF,GAAG,EAAQ,KAAK,CAAC,GAAG;SACvB,CAAC,CAAC,CAAC;IACR,CAAC;IAED,qBAAqB,CAAC,OAAyB;QAC3C,MAAM,MAAM,GAAuB,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;QAEjD,IAAI,CAAC,OAAO,EAAE;YACV,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;SAC3E;QAED,IAAI,OAAO,CAAC,QAAQ,KAAK,IAAI,EAAE;YAC3B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SACjC;QAED,IAAI,OAAO,CAAC,KAAK,KAAK,IAAI,EAAE;YACxB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC9B;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACrC,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;SAChC;QAED,IAAI,OAAO,CAAC,KAAK,KAAK,IAAI,EAAE;YACxB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC9B;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACrC,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;SAChC;QAED,IAAI,OAAO,CAAC,WAAW,KAAK,IAAI,EAAE;YAC9B,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC;SAC9B;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,WAAW,CAAC,GAAW,EAAE,MAAoB,EAAE,IAAa;QACxD,IAAI,CAAC,MAAM,IAAI,CAAC,wBAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAiB,CAAC,EAAE;YACxE,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC;SAClF;QACD,IAAI,CAAC,IAAI,IAAI,IAAI,GAAG,0BAAc,IAAI,IAAI,GAAG,0BAAc,EAAE;YACzD,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC;SAChD;QACD,OAAO,GAAG,gBAAO,GAAG,GAAG,IAAI,MAAM,SAAS,IAAI,EAAE,CAAC;IACrD,CAAC;IAED,QAAQ,CAAC,IAAY,EAAE,GAAG,GAAG,CAAC;QAC1B,OAAO,CAAC,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IACvH,CAAC;IAED,cAAc,CAAC,MAAmC;QAC9C,OAAO;YACH,YAAY,EAAc,MAAM,CAAC,YAAY;YAC7C,YAAY,EAAc,MAAM,CAAC,aAAa;YAC9C,OAAO,EAAmB,MAAM,CAAC,OAAO;YACxC,WAAW,EAAe,MAAM,CAAC,WAAW;YAC5C,wBAAwB,EAAE,MAAM,CAAC,yBAAyB;YAC1D,oBAAoB,EAAM,MAAM,CAAC,qBAAqB;YACtD,UAAU,EAAgB,MAAM,CAAC,UAAU;YAC3C,SAAS,EAAiB,MAAM,CAAC,SAAS;YAC1C,UAAU,EAAgB,MAAM,CAAC,UAAU;YAC3C,SAAS,EAAiB,MAAM,CAAC,SAAS;YAC1C,IAAI,EAAsB,MAAM,CAAC,IAAI;YACrC,iBAAiB,EAAS,MAAM,CAAC,kBAAkB;YACnD,aAAa,EAAa,MAAM,CAAC,cAAc;YAC/C,OAAO,EAAmB,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;YAC1E,QAAQ,EAAkB,MAAM,CAAC,QAAQ;YACzC,IAAI,EAAsB,MAAM,CAAC,IAAI;SACX,CAAC;IACnC,CAAC;IAED,WAAW,CAAC,MAAiC;QACzC,MAAM,GAAG,GAAG,MAA0C,CAAC;QACvD,OAAO;YACH,YAAY,EAAe,GAAG,CAAC,YAAY;YAC3C,aAAa,EAAc,GAAG,CAAC,YAAY;YAC3C,OAAO,EAAoB,GAAG,CAAC,OAAO;YACtC,WAAW,EAAgB,GAAG,CAAC,WAAW;YAC1C,yBAAyB,EAAE,GAAG,CAAC,wBAAwB;YACvD,UAAU,EAAiB,GAAG,CAAC,SAAS;YACxC,SAAS,EAAkB,GAAG,CAAC,QAAQ;YACvC,UAAU,EAAiB,GAAG,CAAC,SAAS;YACxC,SAAS,EAAkB,GAAG,CAAC,QAAQ;YACvC,IAAI,EAAuB,GAAG,CAAC,IAAI;YACnC,kBAAkB,EAAS,GAAG,CAAC,iBAAiB;YAChD,OAAO,EAAoB,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAA8B,CAAC,CAAC;YAClG,QAAQ,EAAmB,GAAG,CAAC,QAAQ;YACvC,IAAI,EAAuB,GAAG,CAAC,IAAI;SACP,CAAC;IACrC,CAAC;IAED,aAAa,CAAuB,WAAuB;QACvD,IAAI,WAAW,CAAC,QAAQ,EAAE;YACtB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAC5D,IAAI,KAAK,EAAE;gBACP,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,QAAQ,CAAC;gBACpE,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,WAA8B,CAAC,CAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,iBAAO,CAAC,IAAI,CAAgC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;gBACzM,OAAO,OAAY,CAAC;aACvB;SACJ;QACD,OAAO,iBAAO,CAAC,IAAI,CAAI,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACtD,CAAC;IAED,YAAY,CAAC,OAAe,EAAE,QAAgB,EAAE,MAA8B;QAC1E,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,QAAQ,EAAE;YACrE,IAAI,KAAK,CAAC,eAAe,CAAC,EAAE;gBACxB,KAAK,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;aAC5C;iBAAM;gBACH,KAAK,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;aACvF;YACD,OAAO,KAAK,CAAC,eAAe,CAAC,CAAC;SACjC;QACD,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,gBAAM,CAAC,EAAE,GAAG,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/I,CAAC;IAED,YAAY,CAA6B,UAA4B;QACjE,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC3D,IAAI,KAAK,EAAE;YACP,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC;YACjE,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAM,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAO,CAAC,IAAI,CAAI,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;YACvJ,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,SAAU,CAAC,CAAC;YAC1D,IAAI,OAAO,IAAI,SAAS,IAAI,OAAO,EAAE;gBACjC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,MAAe,CAAC,CAAC;aAC3C;YACD,OAAO,MAAM,CAAC;SACjB;QACD,OAAO,iBAAO,CAAC,IAAI,CAAI,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;;AAzaL,uBA0aC;AAED,SAAgB,EAAE,CAAI,KAAc;IAChC,OAAO,IAAI,CAAC;AAChB,CAAC;AAFD,gBAEC"}
431
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Util.js","sourceRoot":"","sources":["../../../lib/util/Util.ts"],"names":[],"mappings":"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"}
package/dist/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "oceanic.js",
3
- "version": "1.7.1",
3
+ "version": "1.7.2-dev.02fa4da",
4
4
  "description": "A NodeJS library for interfacing with Discord.",
5
5
  "main": "./dist/lib/index.js",
6
6
  "types": "./dist/lib/index.d.ts",
@@ -16,18 +16,10 @@
16
16
  "lint": "eslint lib --ext .ts",
17
17
  "lint:fix": "eslint lib --ext .ts --fix",
18
18
  "prepare": "rimraf dist && tsc -p tsconfig.json && cp -r lib/types dist/lib/types",
19
- "test:build": "npm run prepare",
19
+ "test:build": "pnpm run prepare",
20
20
  "test:esm": "node --no-warnings --no-deprecation --experimental-specifier-resolution=node esm.mjs",
21
- "test:docs": "npm i --no-save --ignore-scripts $(npm run --silent docs:verisons) && rimraf docs && node scripts/doc-test.js && npx --yes typedoc",
22
- "docs:verisons": "node -e 'process.stdout.write(Object.entries(require(`./package.json`).docsDependencies).map(([k, v]) => `${k}@${v}`).join(` `));'",
23
- "test": "npm run lint && npm run test:build && npm run test:esm && npm run test:docs"
24
- },
25
- "docsDependencies": {
26
- "typedoc": "^0.23.28",
27
- "typedoc-plugin-extras": "2.3.2",
28
- "typedoc-plugin-rename-defaults": "^0.6.5",
29
- "typedoc-plugin-mdn-links": "^3.0.3",
30
- "rimraf": "^5.0.1"
21
+ "test:docs": "rimraf docs && npx --yes typedoc --options static/typedoc.json",
22
+ "test": "pnpm run lint && pnpm run test:build && pnpm run test:esm && pnpm run test:docs"
31
23
  },
32
24
  "repository": {
33
25
  "type": "git",
@@ -50,24 +42,29 @@
50
42
  "homepage": "https://github.com/OceanicJS/Oceanic#readme",
51
43
  "devDependencies": {
52
44
  "@favware/npm-deprecate": "^1.0.7",
53
- "@types/node": "^20.3.1",
45
+ "@mxssfd/typedoc-theme": "^1.1.2",
46
+ "@types/node": "^20.4.0",
54
47
  "@types/pako": "^2.0.0",
55
48
  "@types/ws": "^8.5.5",
56
- "@typescript-eslint/eslint-plugin": "^5.60.0",
57
- "@typescript-eslint/parser": "^5.60.0",
58
- "eslint": "^8.43.0",
49
+ "@typescript-eslint/eslint-plugin": "^5.61.0",
50
+ "@typescript-eslint/parser": "^5.61.0",
51
+ "eslint": "^8.44.0",
59
52
  "eslint-plugin-import": "^2.27.5",
60
- "eslint-plugin-import-newlines": "^1.3.1",
61
- "eslint-plugin-jsdoc": "^46.2.6",
53
+ "eslint-plugin-import-newlines": "^1.3.4",
54
+ "eslint-plugin-jsdoc": "^46.4.3",
62
55
  "eslint-plugin-json": "^3.1.0",
63
56
  "eslint-plugin-prefer-arrow": "^1.2.3",
64
57
  "eslint-plugin-unicorn": "^47.0.0",
65
58
  "eslint-plugin-unused-imports": "^2.0.0",
66
59
  "rimraf": "^5.0.1",
67
- "typescript": "<5.5 >=5.x"
60
+ "typedoc": "^0.24.8",
61
+ "typedoc-plugin-extras": "2.3.3",
62
+ "typedoc-plugin-mdn-links": "^3.0.3",
63
+ "typedoc-plugin-merge-modules": "^5.0.1",
64
+ "typescript": "^5.1.6"
68
65
  },
69
66
  "dependencies": {
70
- "tslib": "^2.5.3",
67
+ "tslib": "^2.6.0",
71
68
  "undici": "^5.22.1",
72
69
  "ws": "^8.13.0"
73
70
  },
@@ -76,5 +73,10 @@
76
73
  },
77
74
  "optionalDependencies": {
78
75
  "@discordjs/voice": "^0.16.0"
76
+ },
77
+ "pnpm": {
78
+ "patchedDependencies": {
79
+ "typedoc-plugin-merge-modules@5.0.1": "patches/typedoc-plugin-merge-modules@5.0.1.patch"
80
+ }
79
81
  }
80
82
  }
package/esm.mjs CHANGED
@@ -34,6 +34,7 @@ const InteractionResolvedChannel = (await import("./dist/lib/structures/Interact
34
34
  const InteractionOptionsWrapper = (await import("./dist/lib/util/InteractionOptionsWrapper.js")).default.default;
35
35
  const Invite = (await import("./dist/lib/structures/Invite.js")).default.default;
36
36
  const InviteGuild = (await import("./dist/lib/structures/InviteGuild.js")).default.default;
37
+ const MediaChannel = (await import("./dist/lib/structures/MediaChannel.js")).default.default;
37
38
  const Member = (await import("./dist/lib/structures/Member.js")).default.default;
38
39
  const Message = (await import("./dist/lib/structures/Message.js")).default.default;
39
40
  const ModalSubmitInteraction = (await import("./dist/lib/structures/ModalSubmitInteraction.js")).default.default;
@@ -52,6 +53,7 @@ const Role = (await import("./dist/lib/structures/Role.js")).default.default;
52
53
  const Routes = (await import("./dist/lib/util/Routes.js")).default;
53
54
  const SelectMenuValuesWrapper = (await import ("./dist/lib/util/SelectMenuValuesWrapper.js")).default.default;
54
55
  const SequentialBucket = (await import("./dist/lib/rest/SequentialBucket.js")).default.default;
56
+ const SimpleCollection = (await import("./dist/lib/util/SimpleCollection.js")).default.default;
55
57
  const Shard = (await import("./dist/lib/gateway/Shard.js")).default.default;
56
58
  const ShardManager = (await import("./dist/lib/gateway/ShardManager.js")).default.default;
57
59
  const StageChannel = (await import("./dist/lib/structures/StageChannel.js")).default.default;
@@ -61,6 +63,7 @@ const TextableChannel = (await import("./dist/lib/structures/TextableChannel.js"
61
63
  const TextableVoiceChannel = (await import("./dist/lib/structures/TextableVoiceChannel.js")).default.default;
62
64
  const ThreadableChannel = (await import("./dist/lib/structures/ThreadableChannel.js")).default.default;
63
65
  const ThreadChannel = (await import("./dist/lib/structures/ThreadChannel.js")).default.default;
66
+ const ThreadOnlyChannel = (await import("./dist/lib/structures/ThreadOnlyChannel.js")).default.default;
64
67
  const TextChannel = (await import("./dist/lib/structures/TextChannel.js")).default.default;
65
68
  const TypedCollection = (await import("./dist/lib/util/TypedCollection.js")).default.default;
66
69
  const TypedEmitter = (await import("./dist/lib/util/TypedEmitter.js")).default.default;
@@ -110,6 +113,7 @@ export {
110
113
  InteractionOptionsWrapper,
111
114
  Invite,
112
115
  InviteGuild,
116
+ MediaChannel,
113
117
  Member,
114
118
  Message,
115
119
  ModalSubmitInteraction,
@@ -128,6 +132,7 @@ export {
128
132
  Routes,
129
133
  SelectMenuValuesWrapper,
130
134
  SequentialBucket,
135
+ SimpleCollection,
131
136
  Shard,
132
137
  ShardManager,
133
138
  StageChannel,
@@ -138,6 +143,7 @@ export {
138
143
  TextChannel,
139
144
  ThreadableChannel,
140
145
  ThreadChannel,
146
+ ThreadOnlyChannel,
141
147
  TypedCollection,
142
148
  TypedEmitter,
143
149
  UnavailableGuild,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "oceanic.js",
3
- "version": "1.7.1",
3
+ "version": "1.7.2-dev.02fa4da",
4
4
  "description": "A NodeJS library for interfacing with Discord.",
5
5
  "main": "./dist/lib/index.js",
6
6
  "types": "./dist/lib/index.d.ts",
@@ -16,18 +16,10 @@
16
16
  "lint": "eslint lib --ext .ts",
17
17
  "lint:fix": "eslint lib --ext .ts --fix",
18
18
  "prepare": "rimraf dist && tsc -p tsconfig.json && cp -r lib/types dist/lib/types",
19
- "test:build": "npm run prepare",
19
+ "test:build": "pnpm run prepare",
20
20
  "test:esm": "node --no-warnings --no-deprecation --experimental-specifier-resolution=node esm.mjs",
21
- "test:docs": "npm i --no-save --ignore-scripts $(npm run --silent docs:verisons) && rimraf docs && node scripts/doc-test.js && npx --yes typedoc",
22
- "docs:verisons": "node -e 'process.stdout.write(Object.entries(require(`./package.json`).docsDependencies).map(([k, v]) => `${k}@${v}`).join(` `));'",
23
- "test": "npm run lint && npm run test:build && npm run test:esm && npm run test:docs"
24
- },
25
- "docsDependencies": {
26
- "typedoc": "^0.23.28",
27
- "typedoc-plugin-extras": "2.3.2",
28
- "typedoc-plugin-rename-defaults": "^0.6.5",
29
- "typedoc-plugin-mdn-links": "^3.0.3",
30
- "rimraf": "^5.0.1"
21
+ "test:docs": "rimraf docs && npx --yes typedoc --options static/typedoc.json",
22
+ "test": "pnpm run lint && pnpm run test:build && pnpm run test:esm && pnpm run test:docs"
31
23
  },
32
24
  "repository": {
33
25
  "type": "git",
@@ -50,24 +42,29 @@
50
42
  "homepage": "https://github.com/OceanicJS/Oceanic#readme",
51
43
  "devDependencies": {
52
44
  "@favware/npm-deprecate": "^1.0.7",
53
- "@types/node": "^20.3.1",
45
+ "@mxssfd/typedoc-theme": "^1.1.2",
46
+ "@types/node": "^20.4.0",
54
47
  "@types/pako": "^2.0.0",
55
48
  "@types/ws": "^8.5.5",
56
- "@typescript-eslint/eslint-plugin": "^5.60.0",
57
- "@typescript-eslint/parser": "^5.60.0",
58
- "eslint": "^8.43.0",
49
+ "@typescript-eslint/eslint-plugin": "^5.61.0",
50
+ "@typescript-eslint/parser": "^5.61.0",
51
+ "eslint": "^8.44.0",
59
52
  "eslint-plugin-import": "^2.27.5",
60
- "eslint-plugin-import-newlines": "^1.3.1",
61
- "eslint-plugin-jsdoc": "^46.2.6",
53
+ "eslint-plugin-import-newlines": "^1.3.4",
54
+ "eslint-plugin-jsdoc": "^46.4.3",
62
55
  "eslint-plugin-json": "^3.1.0",
63
56
  "eslint-plugin-prefer-arrow": "^1.2.3",
64
57
  "eslint-plugin-unicorn": "^47.0.0",
65
58
  "eslint-plugin-unused-imports": "^2.0.0",
66
59
  "rimraf": "^5.0.1",
67
- "typescript": "<5.5 >=5.x"
60
+ "typedoc": "^0.24.8",
61
+ "typedoc-plugin-extras": "2.3.3",
62
+ "typedoc-plugin-mdn-links": "^3.0.3",
63
+ "typedoc-plugin-merge-modules": "^5.0.1",
64
+ "typescript": "^5.1.6"
68
65
  },
69
66
  "dependencies": {
70
- "tslib": "^2.5.3",
67
+ "tslib": "^2.6.0",
71
68
  "undici": "^5.22.1",
72
69
  "ws": "^8.13.0"
73
70
  },
@@ -76,5 +73,10 @@
76
73
  },
77
74
  "optionalDependencies": {
78
75
  "@discordjs/voice": "^0.16.0"
76
+ },
77
+ "pnpm": {
78
+ "patchedDependencies": {
79
+ "typedoc-plugin-merge-modules@5.0.1": "patches/typedoc-plugin-merge-modules@5.0.1.patch"
80
+ }
79
81
  }
80
82
  }
@@ -0,0 +1,26 @@
1
+ diff --git a/dist/merger/project_merger.js b/dist/merger/project_merger.js
2
+ index bf66c8ba53fdf558d6fc775f32241e9ca285d9be..a1d1938bba9997f53506cf2d94dd09fdb36eebc0 100644
3
+ --- a/dist/merger/project_merger.js
4
+ +++ b/dist/merger/project_merger.js
5
+ @@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.ProjectMerger = void 0;
7
+ /** @module merger */
8
+ const typedoc_1 = require("typedoc");
9
+ +
10
+ /**
11
+ * Merger that moves the content of all modules into the project root.
12
+ */
13
+ @@ -23,8 +24,13 @@ class ProjectMerger {
14
+ if (modules.length > 0) {
15
+ this.project.children = [];
16
+ for (const mod of modules) {
17
+ + if(["Constants", "Routes"].includes(mod.name) || mod.name.startsWith("Types/")) {
18
+ + this.project.children.push(mod);
19
+ + continue;
20
+ + }
21
+ const reflections = (_b = mod.children) !== null && _b !== void 0 ? _b : [];
22
+ for (const ref of reflections) {
23
+ + if(mod.name.startsWith("REST/")) ref.name = `REST/${ref.name}`;
24
+ // Drop aliases
25
+ if (!ref.kindOf(typedoc_1.ReflectionKind.Reference)) {
26
+ ref.parent = this.project;