fix: resolve eslint issues

niieani · Dec 18, 2020 · 7a9e9f6 · 7a9e9f6
1 parent fc0c66c
commit 7a9e9f6
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 14 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -35,7 +35,6 @@ module.exports = {
         'jest/no-jasmine-globals': 'error',
         'jest/no-jest-import': 'error',
         'jest/no-test-prefixes': 'error',
-        'jest/no-test-callback': 'error',
         'jest/no-test-return-statement': 'error',
         'jest/prefer-to-have-length': 'warn',
         'jest/prefer-spy-on': 'error',

diff --git a/lib/hashids.ts b/lib/hashids.ts
@@ -41,7 +41,9 @@ export default class Hashids {
 
     if (uniqueAlphabet.length < minAlphabetLength) {
       throw new Error(
-        `Hashids: alphabet must contain at least ${minAlphabetLength} unique characters, provided: ${uniqueAlphabet}`,
+        `Hashids: alphabet must contain at least ${minAlphabetLength} unique characters, provided: ${uniqueAlphabet.join(
+          '',
+        )}`,
       )
     }
 
@@ -164,7 +166,7 @@ export default class Hashids {
     return this.encode(numbers)
   }
 
-  public decodeHex(id: string) {
+  public decodeHex(id: string): string {
     return this.decode(id)
       .map((number) => number.toString(16).slice(1))
       .join('')

diff --git a/tests/bad-input.test.ts b/tests/bad-input.test.ts
@@ -11,7 +11,7 @@ describe('bad input', () => {
 
   test(`should throw an error when alphabet not a string`, () => {
     expect(() => {
-      // @ts-ignore
+      // @ts-expect-error wrong output
       void new Hashids('', 0, 7)
     }).toThrow(TypeError)
   })
@@ -48,7 +48,7 @@ describe('bad input', () => {
   })
 
   test(`should return an empty string when encoding a null`, () => {
-    // @ts-ignore
+    // @ts-expect-error wrong output
     const id = hashids.encode(null)
     expect(id).toEqual('')
   })
@@ -59,7 +59,7 @@ describe('bad input', () => {
   })
 
   test(`should return an empty string when encoding an undefined`, () => {
-    // @ts-ignore
+    // @ts-expect-error wrong output
     const id = hashids.encode(undefined)
     expect(id).toEqual('')
   })
@@ -70,7 +70,7 @@ describe('bad input', () => {
   })
 
   test(`should return an empty array when decoding nothing`, () => {
-    // @ts-ignore
+    // @ts-expect-error wrong output
     const numbers = hashids.decode()
     expect(numbers).toEqual([])
   })

diff --git a/tests/benchmark.ts b/tests/benchmark.ts
@@ -1,5 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-var-requires */
-/* eslint-disable @typescript-eslint/camelcase */
 /* eslint-disable no-console */
 import benchmark from 'nodemark'
 import Hashids from '../lib/hashids'

diff --git a/tests/bigint.test.ts b/tests/bigint.test.ts
@@ -5,12 +5,11 @@ const _BigInt = typeof BigInt === 'function' ? BigInt : undefined
 
 describe('BigInt environment', () => {
   beforeAll(() => {
-    // @ts-ignore
+    // @ts-expect-error wrong output
     delete global.BigInt
   })
 
   afterAll(() => {
-    // @ts-ignore
     if (_BigInt) global.BigInt = _BigInt
   })
 

diff --git a/tests/custom-params-hex.test.ts b/tests/custom-params-hex.test.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import Hashids from '../lib/hashids'
 
 const minLength = 30
@@ -27,7 +29,9 @@ describe.each([
   ],
   // bigint format:
   ...(typeof BigInt === 'function'
-    ? require('./bigint-test-cases').customParamsHex
+    ? (require('./bigint-test-cases').customParamsHex as Array<
+        [string, string]
+      >)
     : []),
 ] as [string, string | bigint][])(
   'encodeHex/decodeHex using default params',

diff --git a/tests/custom-params.test.ts b/tests/custom-params.test.ts
@@ -1,3 +1,7 @@
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
+/* eslint-disable @typescript-eslint/no-var-requires */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import Hashids from '../lib/hashids'
 
 const minLength = 30

diff --git a/tests/custom-salt.test.ts b/tests/custom-salt.test.ts
@@ -1,3 +1,6 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import Hashids from '../lib/hashids'
 
 describe('custom salt', () => {

diff --git a/tests/default-params.test.ts b/tests/default-params.test.ts
@@ -1,3 +1,7 @@
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
+/* eslint-disable @typescript-eslint/no-var-requires */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import Hashids from '../lib/hashids'
 
 const hashids = new Hashids()

diff --git a/tests/requiring.test.ts b/tests/requiring.test.ts
@@ -1,17 +1,19 @@
-// @ts-ignore
+/* eslint-disable @typescript-eslint/no-var-requires */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+// @ts-expect-error wrong output
 import ImportedHashids from '../cjs'
 
 describe('requiring', () => {
   test('via node', () => {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const Hashids = require('../cjs')
+    const Hashids = require('../cjs') as typeof import('../lib/hashids').default
     expect(typeof Hashids).toBe('function')
     const instance = new Hashids('Not Real', 5, 'ABCDEFGHJKMNPQRTWXY234689')
     expect(instance).toBeInstanceOf(Hashids)
   })
 
   test('via babel default import', () => {
     expect(typeof ImportedHashids).toBe('function')
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
     const instance = new ImportedHashids(
       'Not Real',
       5,