Fix @typescript-eslint/no-unused-expressions related issues

Author: aryaemami59

packages/toolkit/src/immutableStateInvariantMiddleware.ts

@@ -1,5 +1,6 @@
 import type { Middleware } from 'redux'
 import type { IgnorePaths } from './serializableStateInvariantMiddleware'
+import type { AnyObject } from './tsHelpers'
 import { getTimeMeasureUtils } from './utils'
 
 type EntryProcessor = (key: string, value: any) => any
@@ -190,8 +191,16 @@ export function createImmutableStateInvariantMiddleware(
       return function (this: any, key: string, value: any) {
         if (stack.length > 0) {
           const thisPos = stack.indexOf(this)
-          ~thisPos ? stack.splice(thisPos + 1) : stack.push(this)
-          ~thisPos ? keys.splice(thisPos, Infinity, key) : keys.push(key)
+          if (~thisPos) {
+            stack.splice(thisPos + 1)
+          } else {
+            stack.push(this)
+          }
+          if (~thisPos) {
+            keys.splice(thisPos, Infinity, key)
+          } else {
+            keys.push(key)
+          }
           if (~stack.indexOf(value)) value = decycler!.call(this, key, value)
         } else stack.push(value)
 

packages/toolkit/src/query/tests/cacheCollection.test.ts

@@ -87,8 +87,8 @@ test(`query: handles large keepUnuseDataFor values over 32-bit ms`, async () =>
   expect(onCleanup).not.toHaveBeenCalled()
 
   // _Should_ be called _wayyyy_ in the future (like 24.8 days from now)
-  vi.advanceTimersByTime(THIRTY_TWO_BIT_MAX_TIMER_SECONDS * 1000),
-    expect(onCleanup).toHaveBeenCalled()
+  vi.advanceTimersByTime(THIRTY_TWO_BIT_MAX_TIMER_SECONDS * 1000)
+  expect(onCleanup).toHaveBeenCalled()
 })
 
 describe(`query: await cleanup, keepUnusedDataFor set`, () => {

packages/toolkit/src/query/tests/cleanup.test.tsx

@@ -1,9 +1,9 @@
 // tests for "cleanup-after-unsubscribe" behavior
-import React from 'react'
 
 import { createListenerMiddleware } from '@reduxjs/toolkit'
 import { QueryStatus, createApi } from '@reduxjs/toolkit/query/react'
 import { act, render, screen, waitFor } from '@testing-library/react'
+import type { ReactNode } from 'react'
 import { setupApiStore } from '../../tests/utils/helpers'
 import type { SubscriptionSelectors } from '../core/buildMiddleware/types'
 
@@ -24,7 +24,7 @@ const getSubStateA = () => storeRef.store.getState().api.queries['a(undefined)']
 const getSubStateB = () => storeRef.store.getState().api.queries['b(undefined)']
 
 function UsingA() {
-  const { data } = api.endpoints.a.useQuery()
+  const { data } = api.endpoints.a.useQuery() as { data: ReactNode }
 
   return <>Result: {data} </>
 }

packages/toolkit/src/query/tests/retry.test-d.ts

@@ -1,9 +1,10 @@
-import { retry, type RetryOptions } from '@internal/query/retry'
-import {
-  fetchBaseQuery,
-  type FetchBaseQueryError,
-  type FetchBaseQueryMeta,
-} from '@internal/query/fetchBaseQuery'
+import type { AnyObject } from '@internal/tsHelpers'
+import type {
+  FetchBaseQueryError,
+  FetchBaseQueryMeta,
+  RetryOptions,
+} from '@reduxjs/toolkit/query'
+import { fetchBaseQuery, retry } from '@reduxjs/toolkit/query'
 
 describe('type tests', () => {
   test('RetryOptions only accepts one of maxRetries or retryCondition', () => {
@@ -20,8 +21,8 @@ describe('type tests', () => {
     }).not.toMatchTypeOf<RetryOptions>()
   })
   test('fail can be pretyped to only accept correct error and meta', () => {
-    expectTypeOf(retry.fail).parameter(0).toEqualTypeOf<unknown>()
-    expectTypeOf(retry.fail).parameter(1).toEqualTypeOf<{} | undefined>()
+    expectTypeOf(retry.fail).parameter(0).toBeUnknown()
+    expectTypeOf(retry.fail).parameter(1).toEqualTypeOf<AnyObject | undefined>()
     expectTypeOf(retry.fail).toBeCallableWith('Literally anything', {})
 
     const myBaseQuery = fetchBaseQuery()
@@ -40,7 +41,7 @@ describe('type tests', () => {
       { request: new Request('http://localhost') },
     )
 
-    expectTypeOf(typedFail).parameter(0).not.toMatchTypeOf<string>()
-    expectTypeOf(typedFail).parameter(1).not.toMatchTypeOf<{}>()
+    expectTypeOf(typedFail).parameter(0).not.toBeString()
+    expectTypeOf(typedFail).parameter(1).not.toMatchTypeOf<AnyObject>()
   })
 })

packages/toolkit/src/tests/createDraftSafeSelector.withTypes.test.ts

@@ -44,6 +44,6 @@ describe(createDraftSafeSelector.withTypes, () => {
       (todos) => todos.map(({ id }) => id),
     )
 
-    expect(selectTodoIds(rootState)).to.be.an('array').that.is.not.empty
+    expect(selectTodoIds(rootState)).to.be.an('array').with.lengthOf(2)
   })
 })