Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow BitField's to be passed as number strings. Pretty sure it fixes #722

Browse Source
This commit is contained in:
Madeline 2022-12-22 18:53:21 +11:00
parent 11f75c4a2b
commit bf5f936aec
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/util/util/BitField.ts
View File

@ -136,12 +136,22 @@ export class BitField {
static resolve(bit: BitFieldResolvable = BigInt(0)): bigint { static resolve(bit: BitFieldResolvable = BigInt(0)): bigint {
// @ts-ignore // @ts-ignore
const FLAGS = this.FLAGS || this.constructor?.FLAGS; const FLAGS = this.FLAGS || this.constructor?.FLAGS;
if (typeof bit === "string") {
if (typeof FLAGS[bit] !== "undefined")
return FLAGS[bit];
else
bit = BigInt(bit);
}
if ( if (
(typeof bit === "number" || typeof bit === "bigint") && (typeof bit === "number" || typeof bit === "bigint") &&
bit >= BigInt(0) bit >= BigInt(0)
) )
return BigInt(bit); return BigInt(bit);
if (bit instanceof BitField) return bit.bitfield; if (bit instanceof BitField) return bit.bitfield;
if (Array.isArray(bit)) { if (Array.isArray(bit)) {
// @ts-ignore // @ts-ignore
const resolve = this.constructor?.resolve || this.resolve; const resolve = this.constructor?.resolve || this.resolve;
@ -149,8 +159,7 @@ export class BitField {
.map((p) => resolve.call(this, p)) .map((p) => resolve.call(this, p))
.reduce((prev, p) => BigInt(prev) | BigInt(p), BigInt(0)); .reduce((prev, p) => BigInt(prev) | BigInt(p), BigInt(0));
} }
if (typeof bit === "string" && typeof FLAGS[bit] !== "undefined")
return FLAGS[bit];
throw new RangeError("BITFIELD_INVALID: " + bit); throw new RangeError("BITFIELD_INVALID: " + bit);
} }
} }