diff --git a/deno/rest/v10/oauth2.ts b/deno/rest/v10/oauth2.ts index 67b18765..09f28158 100644 --- a/deno/rest/v10/oauth2.ts +++ b/deno/rest/v10/oauth2.ts @@ -134,10 +134,10 @@ export interface RESTOAuth2BotAuthorizationQuery { * Needs to include bot for the bot flow */ scope: - | OAuth2Scopes.Bot - | `${OAuth2Scopes.Bot}${' ' | '%20'}${string}` - | `${string}${' ' | '%20'}${OAuth2Scopes.Bot}` - | `${string}${' ' | '%20'}${OAuth2Scopes.Bot}${string}${' ' | '%20'}`; + | `${OAuth2Scopes.Bot} ${string}` + | `${OAuth2Scopes.Bot}` + | `${string} ${OAuth2Scopes.Bot} ${string}` + | `${string} ${OAuth2Scopes.Bot}`; /** * The permissions you're requesting * @@ -163,10 +163,10 @@ export interface RESTOAuth2AdvancedBotAuthorizationQuery { * This assumes you include the `bot` scope alongside others (like `identify` for example) */ scope: - | OAuth2Scopes.Bot - | `${OAuth2Scopes.Bot}${' ' | '%20'}${string}` - | `${string}${' ' | '%20'}${OAuth2Scopes.Bot}` - | `${string}${' ' | '%20'}${OAuth2Scopes.Bot}${string}${' ' | '%20'}`; + | `${OAuth2Scopes.Bot} ${string}` + | `${OAuth2Scopes.Bot}` + | `${string} ${OAuth2Scopes.Bot} ${string}` + | `${string} ${OAuth2Scopes.Bot}`; /** * The required permissions bitfield, stringified */ diff --git a/deno/rest/v9/oauth2.ts b/deno/rest/v9/oauth2.ts index b5d9fe77..297001c0 100644 --- a/deno/rest/v9/oauth2.ts +++ b/deno/rest/v9/oauth2.ts @@ -134,10 +134,10 @@ export interface RESTOAuth2BotAuthorizationQuery { * Needs to include bot for the bot flow */ scope: - | OAuth2Scopes.Bot - | `${OAuth2Scopes.Bot}${' ' | '%20'}${string}` - | `${string}${' ' | '%20'}${OAuth2Scopes.Bot}` - | `${string}${' ' | '%20'}${OAuth2Scopes.Bot}${string}${' ' | '%20'}`; + | `${OAuth2Scopes.Bot} ${string}` + | `${OAuth2Scopes.Bot}` + | `${string} ${OAuth2Scopes.Bot} ${string}` + | `${string} ${OAuth2Scopes.Bot}`; /** * The permissions you're requesting * @@ -163,10 +163,10 @@ export interface RESTOAuth2AdvancedBotAuthorizationQuery { * This assumes you include the `bot` scope alongside others (like `identify` for example) */ scope: - | OAuth2Scopes.Bot - | `${OAuth2Scopes.Bot}${' ' | '%20'}${string}` - | `${string}${' ' | '%20'}${OAuth2Scopes.Bot}` - | `${string}${' ' | '%20'}${OAuth2Scopes.Bot}${string}${' ' | '%20'}`; + | `${OAuth2Scopes.Bot} ${string}` + | `${OAuth2Scopes.Bot}` + | `${string} ${OAuth2Scopes.Bot} ${string}` + | `${string} ${OAuth2Scopes.Bot}`; /** * The required permissions bitfield, stringified */ diff --git a/rest/v10/oauth2.ts b/rest/v10/oauth2.ts index 2552cead..c18993a7 100644 --- a/rest/v10/oauth2.ts +++ b/rest/v10/oauth2.ts @@ -134,10 +134,10 @@ export interface RESTOAuth2BotAuthorizationQuery { * Needs to include bot for the bot flow */ scope: - | OAuth2Scopes.Bot - | `${OAuth2Scopes.Bot}${' ' | '%20'}${string}` - | `${string}${' ' | '%20'}${OAuth2Scopes.Bot}` - | `${string}${' ' | '%20'}${OAuth2Scopes.Bot}${string}${' ' | '%20'}`; + | `${OAuth2Scopes.Bot} ${string}` + | `${OAuth2Scopes.Bot}` + | `${string} ${OAuth2Scopes.Bot} ${string}` + | `${string} ${OAuth2Scopes.Bot}`; /** * The permissions you're requesting * @@ -163,10 +163,10 @@ export interface RESTOAuth2AdvancedBotAuthorizationQuery { * This assumes you include the `bot` scope alongside others (like `identify` for example) */ scope: - | OAuth2Scopes.Bot - | `${OAuth2Scopes.Bot}${' ' | '%20'}${string}` - | `${string}${' ' | '%20'}${OAuth2Scopes.Bot}` - | `${string}${' ' | '%20'}${OAuth2Scopes.Bot}${string}${' ' | '%20'}`; + | `${OAuth2Scopes.Bot} ${string}` + | `${OAuth2Scopes.Bot}` + | `${string} ${OAuth2Scopes.Bot} ${string}` + | `${string} ${OAuth2Scopes.Bot}`; /** * The required permissions bitfield, stringified */ diff --git a/rest/v9/oauth2.ts b/rest/v9/oauth2.ts index 059cf7e6..6178b61a 100644 --- a/rest/v9/oauth2.ts +++ b/rest/v9/oauth2.ts @@ -134,10 +134,10 @@ export interface RESTOAuth2BotAuthorizationQuery { * Needs to include bot for the bot flow */ scope: - | OAuth2Scopes.Bot - | `${OAuth2Scopes.Bot}${' ' | '%20'}${string}` - | `${string}${' ' | '%20'}${OAuth2Scopes.Bot}` - | `${string}${' ' | '%20'}${OAuth2Scopes.Bot}${string}${' ' | '%20'}`; + | `${OAuth2Scopes.Bot} ${string}` + | `${OAuth2Scopes.Bot}` + | `${string} ${OAuth2Scopes.Bot} ${string}` + | `${string} ${OAuth2Scopes.Bot}`; /** * The permissions you're requesting * @@ -163,10 +163,10 @@ export interface RESTOAuth2AdvancedBotAuthorizationQuery { * This assumes you include the `bot` scope alongside others (like `identify` for example) */ scope: - | OAuth2Scopes.Bot - | `${OAuth2Scopes.Bot}${' ' | '%20'}${string}` - | `${string}${' ' | '%20'}${OAuth2Scopes.Bot}` - | `${string}${' ' | '%20'}${OAuth2Scopes.Bot}${string}${' ' | '%20'}`; + | `${OAuth2Scopes.Bot} ${string}` + | `${OAuth2Scopes.Bot}` + | `${string} ${OAuth2Scopes.Bot} ${string}` + | `${string} ${OAuth2Scopes.Bot}`; /** * The required permissions bitfield, stringified */ diff --git a/tests/v10/oauth2.test-d.ts b/tests/v10/oauth2.test-d.ts new file mode 100644 index 00000000..7ee7128e --- /dev/null +++ b/tests/v10/oauth2.test-d.ts @@ -0,0 +1,21 @@ +import { expectAssignable, expectNotAssignable } from 'tsd'; +import type { OAuth2Scopes, RESTOAuth2BotAuthorizationQuery, RESTOAuth2AdvancedBotAuthorizationQuery } from '../../v10'; + +declare const validBotScope: + | OAuth2Scopes.Bot + | 'bot' + | 'bot identify' + | 'applications.commands bot' + | 'applications.commands bot identify'; +declare const invalidBotScope: + | OAuth2Scopes.ApplicationsCommands + | 'applications.commands' + | 'applications.commands identify' + | 'bot%20identify' + | ''; + +expectAssignable(validBotScope); +expectNotAssignable(invalidBotScope); + +expectAssignable(validBotScope); +expectNotAssignable(invalidBotScope); diff --git a/tests/v9/oauth2.test-d.ts b/tests/v9/oauth2.test-d.ts new file mode 100644 index 00000000..28553853 --- /dev/null +++ b/tests/v9/oauth2.test-d.ts @@ -0,0 +1,20 @@ +import { expectAssignable, expectNotAssignable } from 'tsd'; +import type { OAuth2Scopes, RESTOAuth2BotAuthorizationQuery, RESTOAuth2AdvancedBotAuthorizationQuery } from '../../v9'; + +declare const validBotScope: + | OAuth2Scopes.Bot + | 'bot' + | 'bot identify' + | 'applications.commands bot' + | 'applications.commands bot identify'; +declare const invalidBotScope: + | OAuth2Scopes.ApplicationsCommands + | 'applications.commands' + | 'applications.commands identify' + | ''; + +expectAssignable(validBotScope); +expectNotAssignable(invalidBotScope); + +expectAssignable(validBotScope); +expectNotAssignable(invalidBotScope);