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

Fix code inconsistencies and redundancy in util/Collections.js. (#1884)

Browse Source 
* Normalize undefined type checks in collections with typeof operators.

* Remove redundant number type checking in collections.

Number.isInteger() throws false for strings and any other types that aren't numbers.
This commit is contained in:
Cynthia Lin
2017-09-04 08:45:58 -07:00
committed by Crawl
parent 2e4de62ddf
commit 3a503ef56e
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/util/Collection.js
View File

@@ -64,8 +64,7 @@ class Collection extends Map {
* @returns {*|Array<*>} The single value if `count` is undefined, or an array of values of `count` length * @returns {*|Array<*>} The single value if `count` is undefined, or an array of values of `count` length
*/ */
first(count) { first(count) {
if (count === undefined) return this.values().next().value; if (typeof count === 'undefined') return this.values().next().value;
if (typeof count !== 'number') throw new TypeError('The count must be a number.');
if (!Number.isInteger(count) || count < 1) throw new RangeError('The count must be an integer greater than 0.'); if (!Number.isInteger(count) || count < 1) throw new RangeError('The count must be an integer greater than 0.');
count = Math.min(this.size, count); count = Math.min(this.size, count);
const arr = new Array(count); const arr = new Array(count);
@@ -80,8 +79,7 @@ class Collection extends Map {
* @returns {*|Array<*>} The single key if `count` is undefined, or an array of keys of `count` length * @returns {*|Array<*>} The single key if `count` is undefined, or an array of keys of `count` length
*/ */
firstKey(count) { firstKey(count) {
if (count === undefined) return this.keys().next().value; if (typeof count === 'undefined') return this.keys().next().value;
if (typeof count !== 'number') throw new TypeError('The count must be a number.');
if (!Number.isInteger(count) || count < 1) throw new RangeError('The count must be an integer greater than 0.'); if (!Number.isInteger(count) || count < 1) throw new RangeError('The count must be an integer greater than 0.');
count = Math.min(this.size, count); count = Math.min(this.size, count);
const arr = new Array(count); const arr = new Array(count);
@@ -98,8 +96,7 @@ class Collection extends Map {
*/ */
last(count) { last(count) {
const arr = this.array(); const arr = this.array();
if (count === undefined) return arr[arr.length - 1]; if (typeof count === 'undefined') return arr[arr.length - 1];
if (typeof count !== 'number') throw new TypeError('The count must be a number.');
if (!Number.isInteger(count) || count < 1) throw new RangeError('The count must be an integer greater than 0.'); if (!Number.isInteger(count) || count < 1) throw new RangeError('The count must be an integer greater than 0.');
return arr.slice(-count); return arr.slice(-count);
} }
@@ -112,8 +109,7 @@ class Collection extends Map {
*/ */
lastKey(count) { lastKey(count) {
const arr = this.keyArray(); const arr = this.keyArray();
if (count === undefined) return arr[arr.length - 1]; if (typeof count === 'undefined') return arr[arr.length - 1];
if (typeof count !== 'number') throw new TypeError('The count must be a number.');
if (!Number.isInteger(count) || count < 1) throw new RangeError('The count must be an integer greater than 0.'); if (!Number.isInteger(count) || count < 1) throw new RangeError('The count must be an integer greater than 0.');
return arr.slice(-count); return arr.slice(-count);
} }
@@ -126,8 +122,7 @@ class Collection extends Map {
*/ */
random(count) { random(count) {
let arr = this.array(); let arr = this.array();
if (count === undefined) return arr[Math.floor(Math.random() * arr.length)]; if (typeof count === 'undefined') return arr[Math.floor(Math.random() * arr.length)];
if (typeof count !== 'number') throw new TypeError('The count must be a number.');
if (!Number.isInteger(count) || count < 1) throw new RangeError('The count must be an integer greater than 0.'); if (!Number.isInteger(count) || count < 1) throw new RangeError('The count must be an integer greater than 0.');
if (arr.length === 0) return []; if (arr.length === 0) return [];
const rand = new Array(count); const rand = new Array(count);
@@ -144,8 +139,7 @@ class Collection extends Map {
*/ */
randomKey(count) { randomKey(count) {
let arr = this.keyArray(); let arr = this.keyArray();
if (count === undefined) return arr[Math.floor(Math.random() * arr.length)]; if (typeof count === 'undefined') return arr[Math.floor(Math.random() * arr.length)];
if (typeof count !== 'number') throw new TypeError('The count must be a number.');
if (!Number.isInteger(count) || count < 1) throw new RangeError('The count must be an integer greater than 0.'); if (!Number.isInteger(count) || count < 1) throw new RangeError('The count must be an integer greater than 0.');
if (arr.length === 0) return []; if (arr.length === 0) return [];
const rand = new Array(count); const rand = new Array(count);
@@ -248,7 +242,7 @@ class Collection extends Map {
* if (collection.exists('username', 'Bob')) { * if (collection.exists('username', 'Bob')) {
* console.log('user here!'); * console.log('user here!');
* } * }
* @example * @example
* if (collection.exists(user => user.username === 'Bob')) { * if (collection.exists(user => user.username === 'Bob')) {
* console.log('user here!'); * console.log('user here!');
* } * }