Structures

.eslintrc

@@ -8,6 +8,7 @@
     "@typescript-eslint/no-redeclare": "off",
     "@typescript-eslint/no-unnecessary-type-assertion": "off",
     "@typescript-eslint/no-redundant-type-constituents": "off",
+    "@typescript-eslint/require-await": "off",
     "no-empty": ["warn", { "allowEmptyCatch": true }]
   }
 }

.vscode/settings.json

@@ -5,10 +5,10 @@
   "editor.tabSize": 2,
   "explorer.fileNesting.enabled": true,
   "explorer.fileNesting.patterns": {
-    "*.ts": "${capture}.js",
-    "*.js": "${capture}.js.map, ${capture}.min.js, ${capture}.d.ts",
-    "*.jsx": "${capture}.js",
-    "*.tsx": "${capture}.ts",
+    "*.ts": "",
+    "*.js": "",
+    "*.jsx": "",
+    "*.tsx": "",
     "tsconfig.json": "tsconfig.*.json",
     "package.json": "pnpm-*.yaml",
     "README.md": "*.md"

packages/polyfill/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@purplet/polyfill",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Polyfills for node.js and bun.js",
   "keywords": [
     "polyfill",
@@ -26,7 +26,7 @@
   },
   "main": "./src/index.js",
   "files": [
-    "src/index.js",
+    "src",
     "CHANGELOG.md"
   ],
   "dependencies": {

packages/purplet/package.json

@@ -45,10 +45,10 @@
     "@paperdave/logger": "^2.3.0",
     "@paperdave/utils": "1.5.0",
     "@purplet/gateway": "workspace:*",
-    "@purplet/polyfill": "workspace:1.1.0",
+    "@purplet/polyfill": "workspace:*",
     "@purplet/rest": "workspace:*",
     "@purplet/serialize": "workspace:*",
-    "@purplet/utils": "workspace:1.0.0",
+    "@purplet/utils": "workspace:*",
     "@rollup/plugin-alias": "^4.0.0",
     "@rollup/plugin-commonjs": "^23.0.1",
     "@rollup/plugin-node-resolve": "^15.0.0",

packages/purplet/src/structures/interaction/command.ts

@@ -5,17 +5,12 @@ import type {
   APIInteractionDataResolvedChannel,
   APIInteractionDataResolvedGuildMember,
   APIRole,
-  Snowflake} from 'purplet/types';
-import {
-  InteractionType
+  Snowflake,
 } from 'purplet/types';
+import { InteractionType } from 'purplet/types';
 import { Interaction } from './base';
-import type {
-  InteractionResponseMixin} from './response';
-import {
-  applyInteractionResponseMixins,
-  createInteractionMixinList
-} from './response';
+import type { InteractionResponseMixin } from './response';
+import { applyInteractionResponseMixins, createInteractionMixinList } from './response';
 import { EmptyTextChannel } from '../channel';
 import { Message } from '../message';
 import { PartialUser } from '../user';
@@ -79,4 +74,4 @@ const allowedMethods = createInteractionMixinList([
 ]);
 
 applyInteractionResponseMixins(CommandInteraction, allowedMethods);
-export type CommandInteraction = InteractionResponseMixin<typeof allowedMethods>
+export type CommandInteraction = InteractionResponseMixin<typeof allowedMethods>;

packages/rest/README.md

@@ -55,7 +55,7 @@ bun add @purplet/rest discord-api-types
 
 ## Polyfills
 
-Until v18, node.js does not support `fetch`, and no version of node or bun has `FormData` built-in. We provide another package, `@purplet/polyfill` which polyfills these APIs for you:
+Until v18, node.js does not support `fetch` and `FormData`, and bun has yet to implement `FormData`. We provide another package, `@purplet/polyfill` which polyfills these APIs for you:
 
 ```ts
 import '@purplet/polyfill';
@@ -70,9 +70,4 @@ We generate most of our library's route metadata off of these GitHub repositorie
 - [discord-api-docs](https://github.com/discord/discord-api-docs)
 - [discord-api-types](https://github.com/discordjs/discord-api-types)
 
-We do apply some patches of our own, but missing types should be contributed to the above repositories instead of as extra overrides to us. The following routes have buggy or incorrect types:
-
-- Some thread actions are missing. ([types#526](https://github.com/discordjs/discord-api-types/issues/526)) / [purplet#50](https://github.com/CRBT-Team/Purplet/issues/50))
-
-  - `channel.listPublicArchivedThreads`
-  - `channel.listPrivateArchivedThreads`
+We do apply some patches of our own, but missing types should be contributed to the above repositories instead of as extra overrides to us.

packages/rest/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@purplet/rest",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Cross-runtime Discord Rest client",
   "keywords": [
     "discord",
@@ -35,10 +35,11 @@
   },
   "dependencies": {
     "@paperdave/utils": "1.5.0",
-    "@purplet/shared-config": "workspace:*",
-    "@purplet/utils": "workspace:^1.0.0"
+    "@purplet/utils": "workspace:^1.0.0",
+    "utils:workspace": "link:@purplet/utils:workspace"
   },
   "devDependencies": {
+    "@purplet/shared-config": "workspace:*",
     "discord-api-types": "^0.37.14"
   },
   "peerDependencies": {

packages/rest/scripts/gen-routes.js

@@ -76,6 +76,8 @@ const overrides = {
     listVoiceRegions: 'Discord.RESTGetAPIGuildVoiceRegions',
     createWebhook: 'Discord.RESTPostAPIChannelWebhook',
     listJoinedPrivateArchivedThreads: 'Discord.RESTGetAPIChannelUsersThreadsArchived',
+    listPublicArchivedThreads: 'Discord.RESTGetAPIChannelUsersThreadsArchived',
+    listPrivateArchivedThreads: 'Discord.RESTGetAPIChannelUsersThreadsArchived',
     createAutoModerationRule: 'Discord.RESTPostAPIAutoModerationRule',
   },
   body: {
@@ -90,6 +92,8 @@ const overrides = {
     editWebhookMessage: '{ thread_id?: boolean }',
     deleteWebhookMessage: '{ thread_id?: boolean }',
     listJoinedPrivateArchivedThreads: '{ limit?: number; before?: string; }',
+    listPublicArchivedThreads: '{ limit?: number; before?: string; }',
+    listPrivateArchivedThreads: '{ limit?: number; before?: string; }',
   },
   result: {
     modifyCurrentMember: 'Discord.RESTGetAPIGuildMemberResult',

packages/rest/src/Fetcher.ts

@@ -41,6 +41,8 @@ export class Fetcher {
   #globalCount = 0;
   #globalRateLimited?: QueueEntry[];
 
+  constructor(private readonly fetch: typeof globalThis.fetch) {}
+
   async queue<Output>(request: RequestData) {
     const { endpointId, majorId } = classifyEndpoint(
       /^\/api(?:\/v\d+)?(\/.*)/.exec(request.url.pathname)![1],
@@ -77,7 +79,7 @@ export class Fetcher {
       this.runRequest(entry).catch(reject);
     }
 
-    return await promise;
+    return promise;
   }
 
   private setBucketTimer(bucket: Bucket, subBucket: SubBucket) {
@@ -136,7 +138,7 @@ export class Fetcher {
     const subBucket = bucket.sub.get(entry.majorId)!;
 
     const req = entry.request;
-    const response = await fetch(req.url.toString(), req.init);
+    const response = await this.fetch(req.url.toString(), req.init);
 
     const serverNow = response.headers.has('Date')
       ? new Date(response.headers.get('Date')!).getTime()

packages/rest/src/Rest.ts

@@ -39,6 +39,7 @@ export class Rest {
       base: API_BASE_URL,
       tokenType: 'Bot',
       userAgent: defaultUserAgent,
+      fetch,
       ...options,
     };
 
@@ -47,7 +48,7 @@ export class Rest {
       this.options.base = this.options.base.slice(0, -versionSuffix.length);
     }
 
-    this.fetcher = new Fetcher();
+    this.fetcher = new Fetcher(this.options.fetch);
   }
 
   setToken(token: string, tokenType: TokenType = 'Bot') {