chore: ts fix

scripts/tsconfig.json

@@ -4,6 +4,6 @@
   "compilerOptions": {
     "composite": true,
     "noEmit": true,
-    "types": ["@types/bun"]
+    "types": ["@types/bun", "node"]
   }
 }

site/tsconfig.json

@@ -3,7 +3,8 @@
 	"compilerOptions": {
 		"noEmit": true,
 		"jsx": "react-jsx",
-		"resolveJsonModule": true
+		"resolveJsonModule": true,
+		"types": ["node"]
 	},
 	"include": ["./**/*.ts", "./**/*.tsx"],
 	"exclude": ["snippets"]

src/actions/public/getFilterChanges.test-d.ts

@@ -3,6 +3,7 @@ import { describe, expectTypeOf, test } from 'vitest'
 
 import { usdcContractConfig } from '~test/abis.js'
 import { anvilMainnet } from '~test/anvil.js'
+import type { NormalizeType } from '~test/typeUtils.js'
 
 import type { Log } from '../../types/log.js'
 import type { Hash, Hex } from '../../types/misc.js'
@@ -123,7 +124,7 @@ describe('createEventFilter', () => {
       [`0x${string}`, `0x${string}`, `0x${string}`, `0x${string}`]
     >()
     expectTypeOf(logs[0].eventName).toEqualTypeOf<'Foo'>()
-    expectTypeOf(logs[0].args).toEqualTypeOf<{
+    expectTypeOf<NormalizeType<(typeof logs)[number]['args']>>().toEqualTypeOf<{
       owner?: Address
       spender?: Address
       foo?: Address
@@ -174,7 +175,7 @@ describe('createEventFilter', () => {
       [`0x${string}`, `0x${string}`, `0x${string}`, `0x${string}`]
     >()
     expectTypeOf(logs[0].eventName).toEqualTypeOf<'Foo'>()
-    expectTypeOf(logs[0].args).toEqualTypeOf<{
+    expectTypeOf<NormalizeType<(typeof logs)[number]['args']>>().toEqualTypeOf<{
       owner?: Address
       spender?: Address
       foo?: Address
@@ -284,7 +285,7 @@ describe('createEventFilter', () => {
       [`0x${string}`, `0x${string}`, `0x${string}`]
     >()
     expectTypeOf(logs[0].eventName).toEqualTypeOf<'Transfer' | 'Approval'>()
-    expectTypeOf(logs[0].args).toEqualTypeOf<
+    expectTypeOf<NormalizeType<(typeof logs)[number]['args']>>().toEqualTypeOf<
       | {
           from?: Address
           to?: Address
@@ -297,19 +298,18 @@ describe('createEventFilter', () => {
         }
     >()
 
-    expectTypeOf(
-      logs[0].eventName === 'Transfer' && logs[0].args,
-    ).toEqualTypeOf<
+    const transferArgs = logs[0].eventName === 'Transfer' && logs[0].args
+    const approvalArgs = logs[0].eventName === 'Approval' && logs[0].args
+
+    expectTypeOf<NormalizeType<typeof transferArgs>>().toEqualTypeOf<
       | false
       | {
           from?: Address
           to?: Address
           value?: bigint
         }
     >()
-    expectTypeOf(
-      logs[0].eventName === 'Approval' && logs[0].args,
-    ).toEqualTypeOf<
+    expectTypeOf<NormalizeType<typeof approvalArgs>>().toEqualTypeOf<
       | false
       | {
           owner?: Address
@@ -459,7 +459,7 @@ describe('createContractEventFilter', () => {
     expectTypeOf(logs[0].eventName).toEqualTypeOf<
       'Transfer' | 'Approval' | 'Foo'
     >()
-    expectTypeOf(logs[0].args).toEqualTypeOf<
+    expectTypeOf<NormalizeType<(typeof logs)[number]['args']>>().toEqualTypeOf<
       | {
           from?: Address
           to?: Address
@@ -479,27 +479,27 @@ describe('createContractEventFilter', () => {
         }
     >()
 
-    expectTypeOf(
-      logs[0].eventName === 'Transfer' && logs[0].args,
-    ).toEqualTypeOf<
+    const transferArgs = logs[0].eventName === 'Transfer' && logs[0].args
+    const approvalArgs = logs[0].eventName === 'Approval' && logs[0].args
+    const fooArgs = logs[0].eventName === 'Foo' && logs[0].args
+
+    expectTypeOf<NormalizeType<typeof transferArgs>>().toEqualTypeOf<
       | false
       | {
           from?: Address
           to?: Address
           value?: bigint
         }
     >()
-    expectTypeOf(
-      logs[0].eventName === 'Approval' && logs[0].args,
-    ).toEqualTypeOf<
+    expectTypeOf<NormalizeType<typeof approvalArgs>>().toEqualTypeOf<
       | false
       | {
           owner?: Address
           spender?: Address
           value?: bigint
         }
     >()
-    expectTypeOf(logs[0].eventName === 'Foo' && logs[0].args).toEqualTypeOf<
+    expectTypeOf<NormalizeType<typeof fooArgs>>().toEqualTypeOf<
       | false
       | {
           owner?: Address
@@ -586,7 +586,7 @@ describe('createContractEventFilter', () => {
       [`0x${string}`, `0x${string}`, `0x${string}`, `0x${string}`]
     >()
     expectTypeOf(logs[0].eventName).toEqualTypeOf<'Foo'>()
-    expectTypeOf(logs[0].args).toEqualTypeOf<{
+    expectTypeOf<NormalizeType<(typeof logs)[number]['args']>>().toEqualTypeOf<{
       owner?: Address
       spender?: Address
       foo?: Address
@@ -639,7 +639,7 @@ describe('createContractEventFilter', () => {
       [`0x${string}`, `0x${string}`, `0x${string}`, `0x${string}`]
     >()
     expectTypeOf(logs[0].eventName).toEqualTypeOf<'Foo'>()
-    expectTypeOf(logs[0].args).toEqualTypeOf<{
+    expectTypeOf<NormalizeType<(typeof logs)[number]['args']>>().toEqualTypeOf<{
       owner?: Address
       spender?: Address
       foo?: Address

src/actions/public/getFilterChanges.test.ts

@@ -12,6 +12,7 @@ import { ERC20InvalidTransferEvent } from '~contracts/generated.js'
 import { usdcContractConfig } from '~test/abis.js'
 import { anvilMainnet } from '~test/anvil.js'
 import { accounts, address } from '~test/constants.js'
+import type { NormalizeType } from '~test/typeUtils.js'
 import { deployErc20InvalidTransferEvent } from '~test/utils.js'
 import type { Log } from '../../types/log.js'
 import type { Hash } from '../../types/misc.js'
@@ -711,7 +712,7 @@ describe('events', () => {
       Log<bigint, number, false, typeof event.default>[]
     >()
     expectTypeOf(logs[0].eventName).toEqualTypeOf<'Transfer'>()
-    expectTypeOf(logs[0].args).toEqualTypeOf<{
+    expectTypeOf<NormalizeType<(typeof logs)[number]['args']>>().toEqualTypeOf<{
       from?: Address
       to?: Address
       value?: bigint
@@ -882,7 +883,7 @@ describe('events', () => {
 
     expect(logs.length).toBe(1482)
 
-    expectTypeOf(logs[0].args).toEqualTypeOf<{
+    expectTypeOf<NormalizeType<(typeof logs)[number]['args']>>().toEqualTypeOf<{
       from?: Address
       to?: Address
       value?: bigint

src/actions/public/getFilterLogs.test-d.ts

@@ -3,6 +3,7 @@ import { describe, expectTypeOf, test } from 'vitest'
 
 import { usdcContractConfig } from '~test/abis.js'
 import { anvilMainnet } from '~test/anvil.js'
+import type { NormalizeType } from '~test/typeUtils.js'
 
 import type { Log } from '../../types/log.js'
 import type { Hash, Hex } from '../../types/misc.js'
@@ -123,7 +124,7 @@ describe('createEventFilter', () => {
       [`0x${string}`, `0x${string}`, `0x${string}`, `0x${string}`]
     >()
     expectTypeOf(logs[0].eventName).toEqualTypeOf<'Foo'>()
-    expectTypeOf(logs[0].args).toEqualTypeOf<{
+    expectTypeOf<NormalizeType<(typeof logs)[number]['args']>>().toEqualTypeOf<{
       owner?: Address
       spender?: Address
       foo?: Address
@@ -174,7 +175,7 @@ describe('createEventFilter', () => {
       [`0x${string}`, `0x${string}`, `0x${string}`, `0x${string}`]
     >()
     expectTypeOf(logs[0].eventName).toEqualTypeOf<'Foo'>()
-    expectTypeOf(logs[0].args).toEqualTypeOf<{
+    expectTypeOf<NormalizeType<(typeof logs)[number]['args']>>().toEqualTypeOf<{
       owner?: Address
       spender?: Address
       foo?: Address
@@ -284,7 +285,7 @@ describe('createEventFilter', () => {
       [`0x${string}`, `0x${string}`, `0x${string}`]
     >()
     expectTypeOf(logs[0].eventName).toEqualTypeOf<'Transfer' | 'Approval'>()
-    expectTypeOf(logs[0].args).toEqualTypeOf<
+    expectTypeOf<NormalizeType<(typeof logs)[number]['args']>>().toEqualTypeOf<
       | {
           from?: Address
           to?: Address
@@ -297,19 +298,18 @@ describe('createEventFilter', () => {
         }
     >()
 
-    expectTypeOf(
-      logs[0].eventName === 'Transfer' && logs[0].args,
-    ).toEqualTypeOf<
+    const transferArgs = logs[0].eventName === 'Transfer' && logs[0].args
+    const approvalArgs = logs[0].eventName === 'Approval' && logs[0].args
+
+    expectTypeOf<NormalizeType<typeof transferArgs>>().toEqualTypeOf<
       | false
       | {
           from?: Address
           to?: Address
           value?: bigint
         }
     >()
-    expectTypeOf(
-      logs[0].eventName === 'Approval' && logs[0].args,
-    ).toEqualTypeOf<
+    expectTypeOf<NormalizeType<typeof approvalArgs>>().toEqualTypeOf<
       | false
       | {
           owner?: Address
@@ -459,7 +459,7 @@ describe('createContractEventFilter', () => {
     expectTypeOf(logs[0].eventName).toEqualTypeOf<
       'Transfer' | 'Approval' | 'Foo'
     >()
-    expectTypeOf(logs[0].args).toEqualTypeOf<
+    expectTypeOf<NormalizeType<(typeof logs)[number]['args']>>().toEqualTypeOf<
       | {
           from?: Address
           to?: Address
@@ -555,7 +555,7 @@ describe('createContractEventFilter', () => {
       [`0x${string}`, `0x${string}`, `0x${string}`, `0x${string}`]
     >()
     expectTypeOf(logs[0].eventName).toEqualTypeOf<'Foo'>()
-    expectTypeOf(logs[0].args).toEqualTypeOf<{
+    expectTypeOf<NormalizeType<(typeof logs)[number]['args']>>().toEqualTypeOf<{
       owner?: Address
       spender?: Address
       foo?: Address
@@ -608,7 +608,7 @@ describe('createContractEventFilter', () => {
       [`0x${string}`, `0x${string}`, `0x${string}`, `0x${string}`]
     >()
     expectTypeOf(logs[0].eventName).toEqualTypeOf<'Foo'>()
-    expectTypeOf(logs[0].args).toEqualTypeOf<{
+    expectTypeOf<NormalizeType<(typeof logs)[number]['args']>>().toEqualTypeOf<{
       owner?: Address
       spender?: Address
       foo?: Address

src/actions/public/getFilterLogs.test.ts

@@ -12,6 +12,7 @@ import { ERC20InvalidTransferEvent } from '~contracts/generated.js'
 import { usdcContractConfig } from '~test/abis.js'
 import { anvilMainnet } from '~test/anvil.js'
 import { accounts, address } from '~test/constants.js'
+import type { NormalizeType } from '~test/typeUtils.js'
 import { deployErc20InvalidTransferEvent } from '~test/utils.js'
 import type { Log } from '../../types/log.js'
 import { getAddress } from '../../utils/address/getAddress.js'
@@ -170,7 +171,7 @@ describe('contract events', () => {
       >[]
     >()
     expectTypeOf(logs[0].eventName).toEqualTypeOf<'Transfer' | 'Approval'>()
-    expectTypeOf(logs[0].args).toEqualTypeOf<
+    expectTypeOf<NormalizeType<(typeof logs)[number]['args']>>().toEqualTypeOf<
       | {
           from?: Address
           to?: Address
@@ -759,7 +760,7 @@ describe('raw events', () => {
 
     expect(logs.length).toBe(1482)
 
-    expectTypeOf(logs[0].args).toEqualTypeOf<{
+    expectTypeOf<NormalizeType<(typeof logs)[number]['args']>>().toEqualTypeOf<{
       from?: Address
       to?: Address
       value?: bigint

src/actions/public/getLogs.test-d.ts

@@ -2,6 +2,7 @@ import type { AbiEvent } from 'abitype'
 import { expectTypeOf, test } from 'vitest'
 
 import { anvilMainnet } from '~test/anvil.js'
+import type { NormalizeType } from '~test/typeUtils.js'
 
 import type { Hash, Hex } from '../../types/misc.js'
 import { getLogs } from './getLogs.js'
@@ -47,7 +48,7 @@ test('event: const assertion', async () => {
   expectTypeOf(logs[0].topics).toEqualTypeOf<
     [`0x${string}`, `0x${string}`, `0x${string}`]
   >()
-  expectTypeOf(logs[0].args).toEqualTypeOf<{
+  expectTypeOf<NormalizeType<(typeof logs)[number]['args']>>().toEqualTypeOf<{
     from?: `0x${string}`
     to?: `0x${string}`
     value?: bigint
@@ -94,7 +95,7 @@ test('event: defined inline', async () => {
   expectTypeOf(logs[0].topics).toEqualTypeOf<
     [`0x${string}`, `0x${string}`, `0x${string}`]
   >()
-  expectTypeOf(logs[0].args).toEqualTypeOf<{
+  expectTypeOf<NormalizeType<(typeof logs)[number]['args']>>().toEqualTypeOf<{
     from?: `0x${string}`
     to?: `0x${string}`
     value?: bigint

src/actions/public/getLogs.test.ts

@@ -11,6 +11,7 @@ import { ERC20InvalidTransferEvent } from '~contracts/generated.js'
 import { usdcContractConfig } from '~test/abis.js'
 import { anvilMainnet } from '~test/anvil.js'
 import { accounts, address } from '~test/constants.js'
+import type { NormalizeType } from '~test/typeUtils.js'
 import { deployErc20InvalidTransferEvent } from '~test/utils.js'
 import type { Log } from '../../types/log.js'
 import { getAddress } from '../../utils/address/getAddress.js'
@@ -304,7 +305,7 @@ describe('events', () => {
     )
     expect(logs.length).toBe(1482)
 
-    expectTypeOf(logs[0].args).toEqualTypeOf<{
+    expectTypeOf<NormalizeType<(typeof logs)[number]['args']>>().toEqualTypeOf<{
       from?: `0x${string}`
       to?: `0x${string}`
       value?: bigint

src/actions/wallet/waitForCallsStatus.ts

@@ -109,7 +109,7 @@ export async function waitForCallsStatus<chain extends Chain | undefined>(
   const { promise, resolve, reject } =
     withResolvers<WaitForCallsStatusReturnType>()
 
-  let timer: Timer | undefined
+  let timer: ReturnType<typeof setTimeout> | undefined
 
   const unobserve = observe(observerId, { resolve, reject }, (emit) => {
     const unpoll = poll(

src/tsconfig.json

@@ -4,6 +4,7 @@
   "exclude": ["./**/*.test.ts", "./**/*.test-d.ts", "./**/*.bench.ts", "./**/*.bench-d.ts"],
   "compilerOptions": {
     "composite": true,
-    "noEmit": true
+    "noEmit": true,
+    "types": ["node"]
   }
 }

src/types/contract.test-d.ts

@@ -6,6 +6,7 @@ import {
 } from 'abitype'
 import type { seaportAbi } from 'abitype/abis'
 import { expectTypeOf, test } from 'vitest'
+import type { NormalizeType } from '~test/typeUtils.js'
 
 import type {
   AbiEventParametersToPrimitiveTypes,
@@ -213,22 +214,28 @@ test('GetEventArgs', () => {
     ],
     'Transfer'
   >
-  expectTypeOf<Result>().toEqualTypeOf<{
-    from?: `0x${string}` | `0x${string}`[] | null | undefined
-    to?: `0x${string}` | `0x${string}`[] | null | undefined
-  }>()
+  expectTypeOf<Result['from']>().toEqualTypeOf<
+    `0x${string}` | `0x${string}`[] | null | undefined
+  >()
+  expectTypeOf<Result['to']>().toEqualTypeOf<
+    `0x${string}` | `0x${string}`[] | null | undefined
+  >()
 })
 
 test('GetValue', () => {
   // payable
   type Result = GetValue<typeof seaportAbi, 'fulfillAdvancedOrder'>
-  expectTypeOf<Result>().toEqualTypeOf<{ value?: bigint }>()
+  expectTypeOf<NormalizeType<Result>>().toEqualTypeOf<{ value?: bigint }>()
 
   // other
-  expectTypeOf<GetValue<typeof seaportAbi, 'getOrderStatus'>>().toEqualTypeOf<{
+  expectTypeOf<
+    NormalizeType<GetValue<typeof seaportAbi, 'getOrderStatus'>>
+  >().toEqualTypeOf<{
     value?: never
   }>()
-  expectTypeOf<GetValue<typeof seaportAbi, 'cancel'>>().toEqualTypeOf<{
+  expectTypeOf<
+    NormalizeType<GetValue<typeof seaportAbi, 'cancel'>>
+  >().toEqualTypeOf<{
     value?: never
   }>()
 
@@ -347,7 +354,7 @@ test('AbiEventParametersToPrimitiveTypes', () => {
       Required: false
     }
   >
-  expectTypeOf<Named_DisableUnion>().toEqualTypeOf<{
+  expectTypeOf<NormalizeType<Named_DisableUnion>>().toEqualTypeOf<{
     foo?: string
     bar?: number
   }>()