Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-15 11:03:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

revert(BitField): ⏪ Bring back-compatibility after BitField serialization (#5910)

Browse Source
This commit is contained in:
DraftMan
2021-06-28 12:54:14 +02:00
committed by GitHub
parent dc671c8ac4
commit 0a0630c049
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/BitField.js
View File

@@ -129,9 +129,10 @@ class BitField {
/** /**
* Data that can be resolved to give a bitfield. This can be: * Data that can be resolved to give a bitfield. This can be:
* * A bit number (this can be a number literal or a value taken from {@link BitField.FLAGS}) * * A bit number (this can be a number literal or a value taken from {@link BitField.FLAGS})
* * A string bit number
* * An instance of BitField * * An instance of BitField
* * An Array of BitFieldResolvable * * An Array of BitFieldResolvable
* @typedef {number|bigint|BitField|BitFieldResolvable[]} BitFieldResolvable * @typedef {number|string|bigint|BitField|BitFieldResolvable[]} BitFieldResolvable
*/ */
/** /**
@@ -144,7 +145,10 @@ class BitField {
if (typeof defaultBit === typeof bit && bit >= defaultBit) return bit; if (typeof defaultBit === typeof bit && bit >= defaultBit) return bit;
if (bit instanceof BitField) return bit.bitfield; if (bit instanceof BitField) return bit.bitfield;
if (Array.isArray(bit)) return bit.map(p => this.resolve(p)).reduce((prev, p) => prev | p, defaultBit); if (Array.isArray(bit)) return bit.map(p => this.resolve(p)).reduce((prev, p) => prev | p, defaultBit);
if (typeof bit === 'string' && typeof this.FLAGS[bit] !== 'undefined') return this.FLAGS[bit]; if (typeof bit === 'string') {
if (typeof this.FLAGS[bit] !== 'undefined') return this.FLAGS[bit];
if (!isNaN(bit)) return typeof defaultBit === 'bigint' ? BigInt(bit) : Number(bit);
}
throw new RangeError('BITFIELD_INVALID', bit); throw new RangeError('BITFIELD_INVALID', bit);
} }
} }

5
typings/index.d.ts vendored
View File

@@ -365,7 +365,7 @@ declare module 'discord.js' {
public valueOf(): N; public valueOf(): N;
public [Symbol.iterator](): IterableIterator<S>; public [Symbol.iterator](): IterableIterator<S>;
public static FLAGS: unknown; public static FLAGS: unknown;
public static resolve(bit?: BitFieldResolvable<any, number | bigint>): number | bigint; public static resolve(bit?: BitFieldResolvable<S, N>): number | bigint;
} }
export class ButtonInteraction extends MessageComponentInteraction { export class ButtonInteraction extends MessageComponentInteraction {
@@ -2874,9 +2874,10 @@ declare module 'discord.js' {
} }
type BitFieldResolvable<T extends string, N extends number | bigint> = type BitFieldResolvable<T extends string, N extends number | bigint> =
| RecursiveReadonlyArray<T | N | Readonly<BitField<T, N>>> | RecursiveReadonlyArray<T | N | `${bigint}` | Readonly<BitField<T, N>>>
| T | T
| N | N
| `${bigint}`
| Readonly<BitField<T, N>>; | Readonly<BitField<T, N>>;
type BufferResolvable = Buffer | string; type BufferResolvable = Buffer | string;