chore: fix type-checking issues post TS upgrade - also bump eslint an…

…d prettier

.eslintrc.js

@@ -25,7 +25,7 @@ module.exports = {
         'eslint:recommended',
         'plugin:@typescript-eslint/recommended',
         'plugin:prettier/recommended',
-        'prettier/@typescript-eslint',
+        'prettier',
       ],
       plugins: ['@typescript-eslint', 'prettier'],
       rules: {
@@ -36,6 +36,8 @@ module.exports = {
         '@typescript-eslint/no-explicit-any': 0,
         '@typescript-eslint/no-non-null-assertion': 0,
         '@typescript-eslint/ban-ts-ignore': 0,
+        '@typescript-eslint/no-duplicate-enum-values': 0,
+        '@typescript-eslint/no-unsafe-declaration-merging': 0,
         '@typescript-eslint/ban-ts-comment': 0,
         '@typescript-eslint/member-ordering': [
           2,

lib/Curl.ts

@@ -246,7 +246,7 @@ class Curl extends EventEmitter {
    *
    * See {@link enable | `enable`} and {@link disable | `disable`}
    */
-  protected features: CurlFeature = 0
+  protected features: CurlFeature = CurlFeature.Empty
 
   // these are for stream handling
   // the streams themselves
@@ -1014,7 +1014,7 @@ class Curl extends EventEmitter {
               try {
                 handle.pause(CurlPause.RecvCont)
               } catch (error) {
-                cb(error)
+                cb(error as Error)
                 return
               }
             }

lib/curly.ts

@@ -22,7 +22,7 @@ import { CurlFeature } from './enum/CurlFeature'
  *
  * @public
  */
-export interface CurlyResult<ResultData extends any = any> {
+export interface CurlyResult<ResultData = any> {
   /**
    * Data will be the body of the requested URL
    */
@@ -79,7 +79,7 @@ const methods = [
   'unsubscribe',
 ] as const
 
-type HttpMethod = typeof methods[number]
+type HttpMethod = (typeof methods)[number]
 
 export type CurlyResponseBodyParser = (
   data: Buffer,
@@ -216,9 +216,10 @@ interface CurlyHttpMethodCall {
    *
    * @typeParam ResultData You can use this to specify the type of the `data` property returned from this call.
    */
-  <ResultData extends any = any>(url: string, options?: CurlyOptions): Promise<
-    CurlyResult<ResultData>
-  >
+  <ResultData = any>(
+    url: string,
+    options?: CurlyOptions,
+  ): Promise<CurlyResult<ResultData>>
 }
 
 // type HttpMethodCalls = { readonly [K in HttpMethod]: CurlyHttpMethodCall }
@@ -238,9 +239,10 @@ export interface CurlyFunction extends HttpMethodCalls {
    * ```
    * @typeParam ResultData You can use this to specify the type of the `data` property returned from this call.
    */
-  <ResultData extends any = any>(url: string, options?: CurlyOptions): Promise<
-    CurlyResult<ResultData>
-  >
+  <ResultData = any>(
+    url: string,
+    options?: CurlyOptions,
+  ): Promise<CurlyResult<ResultData>>
 
   /**
    * **EXPERIMENTAL** This API can change between minor releases
@@ -262,7 +264,7 @@ export interface CurlyFunction extends HttpMethodCalls {
 }
 
 const create = (defaultOptions: CurlyOptions = {}): CurlyFunction => {
-  function curly<ResultData extends any>(
+  function curly<ResultData>(
     url: string,
     options: CurlyOptions = {},
   ): Promise<CurlyResult<ResultData>> {
@@ -339,6 +341,7 @@ const create = (defaultOptions: CurlyOptions = {}): CurlyFunction => {
           const entries = Object.entries(headersReq)
           for (const [headerKey, headerValue] of entries) {
             delete headersReq[headerKey]
+            // @ts-expect-error ignoring this for now
             headersReq[headerKey.toLowerCase()] = headerValue
           }
         }
@@ -381,7 +384,9 @@ const create = (defaultOptions: CurlyOptions = {}): CurlyFunction => {
             headers[headers.length - 1],
           ).find(([k]) => k.toLowerCase() === 'content-type')
 
-          let contentType = contentTypeEntry ? contentTypeEntry[1] : ''
+          let contentType = (
+            contentTypeEntry ? contentTypeEntry[1] : ''
+          ) as string
 
           // remove the metadata of the content-type, like charset
           // See https://tools.ietf.org/html/rfc7231#section-3.1.1.5

lib/enum/CurlFeature.ts

@@ -10,6 +10,11 @@
  * @public
  */
 export enum CurlFeature {
+  /**
+   * Initial state
+   */
+  Empty = 0,
+
   /**
    * Data received is passed as a Buffer to the end event.
    */

lib/types/EasyNativeBinding.ts

@@ -46,7 +46,7 @@ import { SocketState } from '../enum/SocketState'
 
 import { FileInfo, HttpPostField } from './'
 
-export interface GetInfoReturn<DataType extends any = number | string | null> {
+export interface GetInfoReturn<DataType = number | string | null> {
   data: DataType
   code: CurlCode
 }

package.json

@@ -94,17 +94,17 @@
     "@types/mocha": "^7.0.2",
     "@types/node": "^20.8.10",
     "@types/should": "^13.0.0",
-    "@typescript-eslint/eslint-plugin": "^4.4.1",
-    "@typescript-eslint/parser": "^4.4.1",
+    "@typescript-eslint/eslint-plugin": "^6.9.1",
+    "@typescript-eslint/parser": "^6.9.1",
     "cheerio": "^1.0.0-rc.3",
     "clang-format": "^1.8.0",
     "cookie-parser": "^1.4.6",
     "electron-mocha": "^11.0.2",
-    "eslint": "^7.11.0",
-    "eslint-config-prettier": "^6.12.0",
+    "eslint": "^8.53.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-formatter-friendly": "^7.0.0",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-prettier": "^3.1.4",
+    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-prettier": "^5.0.1",
     "express": "4.18.2",
     "formidable": "^1.2.2",
     "http-auth": "^4.2.0",
@@ -115,7 +115,7 @@
     "np": "^7.6.2",
     "nyc": "^15.1.0",
     "octonode": "^0.9.5",
-    "prettier": "^2.7.1",
+    "prettier": "^3.0.3",
     "progress": "^2.0.3",
     "should": "^13.2.3",
     "sort-package-json": "^1.46.0",

scripts/utils/createConstantsFile.js

@@ -32,8 +32,8 @@ const createConstantsFile = async ({
       (option) =>
         `
       ${getDescriptionCommentForOption(option)}readonly ${
-          option.constantName
-        }: "${option.constantName}",
+        option.constantName
+      }: "${option.constantName}",
       `,
     ),
     `}`,

test/curl/http2.spec.ts

@@ -47,16 +47,13 @@ describe('HTTP2', () => {
     })
   })
 
-  after((done) => {
+  after(function (done) {
+    this.timeout(5000)
     serverHttp2.removeListener('error', onError)
     serverHttp2.removeListener('session', onSession)
     serverHttp2.removeListener('stream', onStream)
-    session
-      ? session.close(() => {
-          session.destroy()
-          serverHttp2.close(done)
-        })
-      : serverHttp2.close(done)
+    session.destroy()
+    serverHttp2.close(done)
   })
 
   it('should work with https2 site', (done) => {

test/curl/optionHttpAuth.spec.ts

@@ -58,7 +58,6 @@ describe('Option HTTPAUTH', () => {
     curl.close()
 
     app._router.stack.pop()
-    app._router.stack.pop()
   })
 
   before((done) => {
@@ -70,8 +69,7 @@ describe('Option HTTPAUTH', () => {
   })
 
   it('should authenticate using basic auth', (done) => {
-    app.use(httpAuthConnect(basic))
-    app.get('/', (req, res) => {
+    app.get('/', httpAuthConnect(basic), (req, res) => {
       // @ts-ignore
       res.send(req.user)
     })
@@ -105,8 +103,7 @@ describe('Option HTTPAUTH', () => {
       user = `${realmDigest}/${username}`
     }
 
-    app.use(httpAuthConnect(digest))
-    app.get('/', (req, res) => {
+    app.get('/', httpAuthConnect(digest), (req, res) => {
       // @ts-ignore
       res.send(req.user)
     })
@@ -131,8 +128,7 @@ describe('Option HTTPAUTH', () => {
   })
 
   it('should not authenticate using basic', (done) => {
-    app.use(httpAuthConnect(basic))
-    app.get('/', (req, res) => {
+    app.get('/', httpAuthConnect(basic), (req, res) => {
       // @ts-ignore
       res.send(req.user)
     })

test/curl/streams.spec.ts

@@ -63,7 +63,7 @@ const getReadableStreamForBuffer = (
             wantsMore = false
           }
         } catch (error) {
-          stream.destroy(error)
+          stream.destroy(error as Error)
         }
       }
 
@@ -132,9 +132,11 @@ describe('streams', () => {
           },
         })
 
-        const { statusCode, data: downloadStream, headers } = await curly.put<
-          Readable
-        >(`${url}/all?type=put-upload`, {
+        const {
+          statusCode,
+          data: downloadStream,
+          headers,
+        } = await curly.put<Readable>(`${url}/all?type=put-upload`, {
           ...getUploadOptions(curlyStreamUpload),
           ...getDownloadOptions(),
           curlyProgressCallback() {

test/helper/server.ts

@@ -12,7 +12,6 @@ import path from 'path'
 import { Socket } from 'net'
 
 import express from 'express'
-import bodyParser from 'body-parser'
 import cookieParser from 'cookie-parser'
 
 const file = path.resolve.bind(this, __dirname)
@@ -49,8 +48,9 @@ export const serverHttp2 = http2.createSecureServer({
 })
 
 app
-  .use(bodyParser.urlencoded({ extended: true }))
-  .use(bodyParser.raw({ limit: '100MB', type: 'application/node-libcurl.raw' }))
+  .use(express.urlencoded({ extended: true }))
+  .use(express.raw({ limit: '100MB', type: 'application/node-libcurl.raw' }))
+  // @ts-expect-error - no time for fixing this right now
   .use(cookieParser())
 
 app.disable('etag')

tsconfig.json

@@ -21,7 +21,8 @@
     "allowSyntheticDefaultImports": true,
     "typeRoots": ["node_modules/@types", "types/external"],
     "noUnusedLocals": true,
-    "importHelpers": true
+    "importHelpers": true,
+    "skipLibCheck": true
   },
   "include": ["lib/**/*"],
   "exclude": ["node_modules"],

types/external/http-auth-connect/index.d.ts

@@ -1,4 +1,5 @@
-import * as express from 'express-serve-static-core'
+import * as express from 'express'
+import 'express-serve-static-core'
 import { HttpAuthFunction } from 'http-auth'
 
 declare module 'express-serve-static-core' {
@@ -10,10 +11,4 @@ declare module 'express-serve-static-core' {
   }
 }
 
-export default function connect(
-  func: HttpAuthFunction,
-): (
-  req: express.Request,
-  res: express.Response,
-  next: express.NextFunction,
-) => void
+export default function connect(func: HttpAuthFunction): express.RequestHandler