⬆ update dependencies (#933)

Author: laquasicinque

package.json

@@ -8,7 +8,7 @@
     "node": "16.15.0"
   },
   "scripts": {
-    "dev": "TS_NODE_FILES=true TS_NODE_PROJECT=\"./tsconfig.json\" nodemon -r dotenv/config -x node --experimental-specifier-resolution=node --loader ts-node/esm ./src/index.ts",
+    "dev": "cross-env TS_NODE_FILES=true TS_NODE_PROJECT=\"./tsconfig.json\" nodemon -r dotenv/config -x node --experimental-specifier-resolution=node --loader ts-node/esm ./src/index.ts",
     "start": "node build/index.js",
     "build": "tsc",
     "lint": "eslint src && tsc --noEmit",
@@ -23,40 +23,41 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@mdn/browser-compat-data": "4.2.1",
-    "@sentry/node": "6.19.7",
+    "@mdn/browser-compat-data": "5.0.1",
+    "@sentry/node": "7.0.0",
     "compare-versions": "4.1.3",
+    "cross-env": "^7.0.3",
     "date-fns": "2.28.0",
-    "discord.js": "13.6.0",
+    "discord.js": "13.7.0",
     "dom-parser": "0.1.6",
     "domyno": "1.0.1",
     "fuse.js": "6.6.2",
     "html-entities": "2.3.3",
     "lodash-es": "4.17.21",
-    "mongoose": "6.3.4",
+    "mongoose": "6.3.5",
     "node-cache": "5.1.2",
-    "node-fetch": "3.2.4",
+    "node-fetch": "3.2.5",
     "node-html-parser": "5.3.3",
-    "ts-node": "10.7.0",
+    "ts-node": "10.8.0",
     "typescript": "4.7.2"
   },
   "devDependencies": {
-    "@sentry/types": "6.19.7",
+    "@sentry/types": "7.0.0",
     "@types/dom-parser": "0.1.1",
     "@types/html-entities": "1.3.4",
-    "@types/jest": "27.5.1",
+    "@types/jest": "28.1.0",
     "@types/mongoose": "5.11.97",
-    "@types/node": "16.11.36",
+    "@types/node": "17.0.39",
     "@types/node-fetch": "3.0.3",
     "dotenv": "16.0.1",
     "eslint": "8.16.0",
-    "eslint-config-galex": "3.6.5",
+    "eslint-config-galex": "4.1.3",
     "husky": "8.0.1",
-    "jest": "27.5.1",
-    "lint-staged": "12.4.1",
+    "jest": "28.1.0",
+    "lint-staged": "13.0.0",
     "nodemon": "2.0.16",
     "prettier": "2.6.2",
-    "ts-jest": "27.1.5"
+    "ts-jest": "28.0.4"
   },
   "husky": {
     "hooks": {

src/v2/commands/about/index.ts

@@ -1,8 +1,7 @@
 import type {
-  ApplicationCommandOptionChoice,
+  ApplicationCommandOptionChoiceData,
   Client,
   CommandInteraction,
-  Interaction,
 } from 'discord.js';
 
 import type { CommandDataWithHandler } from '../../../types';
@@ -22,7 +21,7 @@ const aboutMessages = new Map<string, ValueOrNullary<string>>([
 ]);
 
 const mapTransformToChoices = map(
-  (item: string): ApplicationCommandOptionChoice => ({
+  (item: string): ApplicationCommandOptionChoiceData => ({
     name: item,
     value: item,
   })

src/v2/commands/please/index.ts

@@ -1,4 +1,4 @@
-import type { ApplicationCommandOptionChoice, Client, CommandInteraction } from 'discord.js';
+import type { ApplicationCommandOptionChoiceData, Client, CommandInteraction } from 'discord.js';
 
 import type { CommandDataWithHandler } from '../../../types';
 import { map } from '../../utils/map.js';
@@ -13,7 +13,7 @@ import { justAsk } from './handlers/justask.js';
 const pleaseMessages = new Map<string, ValueOrNullary<string>>([format, code, justAsk, english]);
 
 const mapTransformToChoices = map(
-  (item: string): ApplicationCommandOptionChoice => ({
+  (item: string): ApplicationCommandOptionChoiceData => ({
     name: item,
     value: item,
   })

src/v2/commands/resource/index.ts

@@ -1,4 +1,4 @@
-import type { ApplicationCommandOptionChoice, Client, CommandInteraction } from 'discord.js';
+import type { ApplicationCommandOptionChoiceData, Client, CommandInteraction } from 'discord.js';
 
 import { ApplicationCommandOptionType } from '../../../enums.js';
 import type { CommandDataWithHandler } from '../../../types';
@@ -12,7 +12,7 @@ const resourceMessages = new Map<string, ValueOrNullary<{ content: string }>>([
 ]);
 
 const mapTransformToChoices = map(
-  (item: string): ApplicationCommandOptionChoice => ({
+  (item: string): ApplicationCommandOptionChoiceData => ({
     name: item,
     value: item,
   })

src/v2/commands/shitpost/index.ts

@@ -1,4 +1,4 @@
-import type { ApplicationCommandOptionChoice } from 'discord.js';
+import type { ApplicationCommandOptionChoiceData } from 'discord.js';
 
 import type { CommandDataWithHandler } from '../../../types';
 import { ADMIN_ROLE_ID, HELPFUL_ROLE_ID, MOD_ROLE_ID, SERVER_ID } from '../../env.js';
@@ -35,7 +35,7 @@ const shitpostReplacements = {
 };
 
 const mapTransformToChoices = map(
-  (item: string): ApplicationCommandOptionChoice => ({
+  (item: string): ApplicationCommandOptionChoiceData => ({
     name: item,
     value: item,
   })

src/v2/commands/warn/index.ts

@@ -1,5 +1,5 @@
 import type {
-  ApplicationCommandOptionChoice,
+  ApplicationCommandOptionChoiceData,
   Client,
   CommandInteraction,
 } from 'discord.js';

src/v2/commands/whyno/index.ts

@@ -1,4 +1,4 @@
-import type { ApplicationCommandOptionChoice, Client, CommandInteraction } from 'discord.js';
+import type { ApplicationCommandOptionChoiceData, Client, CommandInteraction } from 'discord.js';
 
 import type { CommandDataWithHandler } from '../../../types';
 import { map } from '../../utils/map.js';
@@ -13,7 +13,7 @@ const whynoMessages = new Map<string, ValueOrNullary<string>>([
 ]);
 
 const mapTransformToChoices = map(
-  (item: string): ApplicationCommandOptionChoice => ({
+  (item: string): ApplicationCommandOptionChoiceData => ({
     name: item,
     value: item,
   })

src/v2/utils/Cache.ts

@@ -1,4 +1,4 @@
-import { addBreadcrumb, Severity } from '@sentry/node';
+import { addBreadcrumb } from '@sentry/node';
 import { EventEmitter } from 'events';
 
 import { castArray } from './castArray.js';
@@ -136,14 +136,14 @@ const DEFAULT_OPTIONS: CacheOptions = {
  * @template Value
  * @template Key
  */
-export class Cache<Value = any, Key = any> extends EventEmitter {
+export class Cache<Value = unknown, Key = unknown> extends EventEmitter {
   #data: Map<Key, WrappedValue<Value>>;
 
-  options: CacheOptions;
+  public options: CacheOptions;
 
-  checkTimeout: NodeJS.Timeout;
+  public checkTimeout: NodeJS.Timeout;
 
-  constructor(options: CacheOptions) {
+  public constructor(options: CacheOptions) {
     super();
     this.options = {
       ...DEFAULT_OPTIONS,
@@ -160,11 +160,11 @@ export class Cache<Value = any, Key = any> extends EventEmitter {
    * @param key cache key
    * @returns The value stored in the key
    */
-  get<T extends Value = Value>(key: Key): T | undefined {
+   public get<T extends Value = Value>(key: Key): T | undefined {
     const data = this.#data.get(key);
 
     addBreadcrumb({
-      level: Severity.Debug,
+      level: 'debug',
       message: `Cache [Get]: ${String(key)}`,
     });
 
@@ -180,11 +180,11 @@ export class Cache<Value = any, Key = any> extends EventEmitter {
    * @param keys an array of keys
    * @returns an object containing the values stored in the matching keys
    */
-  mget<T extends Value = Value>(keys: Key[]): Map<Key, T> {
+   public mget<T extends Value = Value>(keys: Key[]): Map<Key, T> {
     const output: Map<Key, T> = new Map();
 
     addBreadcrumb({
-      level: Severity.Debug,
+      level: 'debug',
       message: `Cache [MGet]: keys: ${keys.slice(0, 10)} (${
         keys.length
       } items)`,
@@ -209,11 +209,11 @@ export class Cache<Value = any, Key = any> extends EventEmitter {
    * it to a serialized JSON
    * @param ttl The time to live in seconds.
    */
-  set<T extends Value = Value>(key: Key, value: T, ttl?: number): boolean {
+   public set<T extends Value = Value>(key: Key, value: T, ttl?: number): boolean {
     const usedTtl = ttl ?? this.options.stdTTL;
 
     addBreadcrumb({
-      level: Severity.Debug,
+      level: 'debug',
       message: `Cache [Set]: ${String(key)}: ${String(
         value
       )} | TTL: ${ttl}/${usedTtl}`,
@@ -231,10 +231,10 @@ export class Cache<Value = any, Key = any> extends EventEmitter {
    *
    * @param keyValueSet an array of object which includes key,value and ttl
    */
-  mset<T extends Value = Value>(keyValueSet: ValueSetItem<Key, T>[]): boolean {
+   public mset<T extends Value = Value>(keyValueSet: ValueSetItem<Key, T>[]): boolean {
     const len = keyValueSet.length;
     addBreadcrumb({
-      level: Severity.Debug,
+      level: 'debug',
       message: `Cache [MSet]: ${keyValueSet.length} Items`,
     });
     for (let i = 0; i < len; i++) {
@@ -250,13 +250,13 @@ export class Cache<Value = any, Key = any> extends EventEmitter {
    * @param cb Callback function
    * @returns Number of deleted keys
    */
-  del(keys: Key | Key[]): number {
+   public del(keys: Key | Key[]): number {
     let deleted = 0;
     const keyArr = castArray(keys);
     const data = this.#data;
 
     addBreadcrumb({
-      level: Severity.Debug,
+      level: 'debug',
       message: `Cache [Del]: ${String(keyArr.slice(0, 10))} (${
         keyArr.length
       } items)`,
@@ -282,7 +282,7 @@ export class Cache<Value = any, Key = any> extends EventEmitter {
    * @param key cache key
    * @returns The value stored in the key
    */
-  take<T extends Value = Value>(key: Key): T | undefined {
+   public take<T extends Value = Value>(key: Key): T | undefined {
     const output = this.get(key);
 
     if (this.#data.has(key)) {
@@ -295,7 +295,7 @@ export class Cache<Value = any, Key = any> extends EventEmitter {
   /**
    * reset or redefine the ttl of a key. If `ttl` is not passed or set to 0 it's similar to `.del()`
    */
-  ttl(key: Key, ttl: number = this.options.stdTTL): boolean {
+   public ttl(key: Key, ttl: number = this.options.stdTTL): boolean {
     if (!key) {
       return false;
     }
@@ -308,29 +308,29 @@ export class Cache<Value = any, Key = any> extends EventEmitter {
         this.del(key);
       }
       return true;
-    } 
+    }
       return false;
-    
+
   }
 
-  getTtl(key: Key): number | undefined {
+  public getTtl(key: Key): number | undefined {
     if (!key) {
       return void 0;
     }
 
     const value = this.#data.get(key);
     if (this.#data.has(key) && this._check(key, value)) {
       return value.t;
-    } 
+    }
       return void 0;
-    
+
   }
 
   /**
    * list all keys within this cache
    * @returns An array of all keys
    */
-  keys(): IterableIterator<Key> {
+   public keys(): IterableIterator<Key> {
     return this.#data.keys();
   }
 
@@ -348,14 +348,14 @@ export class Cache<Value = any, Key = any> extends EventEmitter {
    * @param key cache key to check
    * @returns Boolean indicating if the key is cached or not
    */
-  has(key: Key): boolean {
+   public has(key: Key): boolean {
     return this.has(key) && this._check(key, this.#data.get(key));
   }
 
   /**
    * flush the whole data and reset the stats
    */
-  flushAll(_startPeriod = true): void {
+   public flushAll(_startPeriod = true): void {
     this.#data.clear();
     this._killCheckPeriod();
     this._checkData(_startPeriod);
@@ -365,14 +365,14 @@ export class Cache<Value = any, Key = any> extends EventEmitter {
   /**
    * This will clear the interval timeout which is set on checkperiod option.
    */
-  close(): void {
+   public close(): void {
     this._killCheckPeriod();
   }
 
   /**
    * flush the stats and reset all counters to 0
    */
-  flushStats(): void {}
+   public flushStats(): void {}
 
   private _check(key: Key, data) {
     let ret = true;
@@ -390,7 +390,7 @@ export class Cache<Value = any, Key = any> extends EventEmitter {
     if (this.checkTimeout != null) {
       const {checkTimeout} = this;
       this.checkTimeout = null;
-      clearTimeout(checkTimeout); 
+      clearTimeout(checkTimeout);
     }
   }
 

src/v2/utils/useData.ts

@@ -1,4 +1,4 @@
-import { addBreadcrumb, Severity } from '@sentry/node';
+import { addBreadcrumb } from '@sentry/node';
 import type {
   HeadersInit,
   RequestInfo,
@@ -57,19 +57,19 @@ type FetchWithFormat<Format> = (
 const doFetch: <TParsedResponse>(
   cacheKey: string,
   mapper: ResponseMapper<TParsedResponse>
-) => FetchWithFormat<TParsedResponse> = <TParsedResponse>(cacheKey, mapper) => {
+) => FetchWithFormat<TParsedResponse> = <TParsedResponse>(cacheKey, mapper):FetchWithFormat<TParsedResponse> => {
   const casedCacheKey = cacheKey.toLowerCase();
-  const cachedResponse = apiCache.get<TParsedResponse>(casedCacheKey);
+  const cachedResponse = apiCache.get(casedCacheKey);
 
   if (cachedResponse) {
-    return () => cachedResponse;
+    return (async () => cachedResponse) as FetchWithFormat<TParsedResponse>;
   }
 
   return async (url, fetchOptions) => {
     addBreadcrumb({
       category: 'query',
       data: typeof url === 'string' ? { url } : undefined,
-      level: Severity.Info,
+      level: 'info',
       timestamp: Date.now(),
     });
 
@@ -81,7 +81,7 @@ const doFetch: <TParsedResponse>(
     console.timeEnd(timeLabel);
     const formattedResponse = await mapper(response);
     apiCache.set(casedCacheKey, formattedResponse);
-    return formattedResponse;
+    return formattedResponse as TParsedResponse;
   };
 };