Skip to content

Commit 2f84ba0

Browse files
jdaltonjdalton
committed
fix(types): consistent-type-imports — hoist 16 inline import() annotations across 10 test files
1 parent b011a08 commit 2f84ba0

10 files changed

Lines changed: 53 additions & 27 deletions

‎packages/cli/test/unit/commands/config/cmd-config-list.test.mts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
import { beforeEach, describe, expect, it, vi } from 'vitest'
88

9+
import type * as LoggerModule from '@socketsecurity/lib/logger'
10+
911
// Mock the logger.
1012
const mockLogger = vi.hoisted(() => ({
1113
error: vi.fn(),
@@ -18,7 +20,7 @@ const mockLogger = vi.hoisted(() => ({
1820

1921
vi.mock('@socketsecurity/lib/logger', async importOriginal => {
2022
const actual =
21-
await importOriginal<typeof import('@socketsecurity/lib/logger')>()
23+
await importOriginal<typeof LoggerModule>()
2224
return {
2325
...actual,
2426
getDefaultLogger: () => mockLogger,

‎packages/cli/test/unit/commands/config/cmd-config-set.test.mts‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131

3232
import { beforeEach, describe, expect, it, vi } from 'vitest'
3333

34+
import type * as ConfigModule from '../../../../src/utils/config.mts'
35+
import type * as LoggerModule from '@socketsecurity/lib/logger'
36+
import type * as WithSubcommandsModule from '../../../../src/utils/cli/with-subcommands.mjs'
37+
3438
// Mock the logger.
3539
const mockLogger = vi.hoisted(() => ({
3640
error: vi.fn(),
@@ -43,7 +47,7 @@ const mockLogger = vi.hoisted(() => ({
4347

4448
vi.mock('@socketsecurity/lib/logger', async importOriginal => {
4549
const actual =
46-
await importOriginal<typeof import('@socketsecurity/lib/logger')>()
50+
await importOriginal<typeof LoggerModule>()
4751
return {
4852
...actual,
4953
getDefaultLogger: () => mockLogger,
@@ -70,7 +74,7 @@ const mockGetSupportedConfigEntries = vi.hoisted(() =>
7074

7175
vi.mock('../../../../src/utils/config.mts', async importOriginal => {
7276
const actual =
73-
await importOriginal<typeof import('../../../../src/utils/config.mts')>()
77+
await importOriginal<typeof ConfigModule>()
7478
return {
7579
...actual,
7680
getSupportedConfigEntries: mockGetSupportedConfigEntries,
@@ -138,7 +142,7 @@ vi.mock(
138142
async importOriginal => {
139143
const actual =
140144
await importOriginal<
141-
typeof import('../../../../src/utils/cli/with-subcommands.mjs')
145+
typeof WithSubcommandsModule
142146
>()
143147
return {
144148
...actual,
@@ -297,7 +301,7 @@ describe('cmd-config-set', () => {
297301

298302
// Should have value validation that checks for presence.
299303
const valueValidation = validations.find(
300-
(v: any) =>
304+
(v: unknown) =>
301305
v.message &&
302306
(v.message.includes('value') || v.message.includes('unset')),
303307
)
@@ -313,7 +317,7 @@ describe('cmd-config-set', () => {
313317
const validations = call.slice(1)
314318

315319
const valueValidation = validations.find(
316-
(v: any) =>
320+
(v: unknown) =>
317321
v.message &&
318322
(v.message.includes('value') || v.message.includes('unset')),
319323
)
@@ -486,7 +490,7 @@ describe('cmd-config-set', () => {
486490
// Check that validation includes the conflicting flags check.
487491
const validations = call.slice(1)
488492
const conflictCheck = validations.find(
489-
(v: any) =>
493+
(v: unknown) =>
490494
v.message &&
491495
v.message.includes('--json') &&
492496
v.message.includes('--markdown'),

‎packages/cli/test/unit/commands/config/cmd-config-unset.test.mts‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030

3131
import { beforeEach, describe, expect, it, vi } from 'vitest'
3232

33+
import type * as ConfigModule from '../../../../src/utils/config.mts'
34+
import type * as LoggerModule from '@socketsecurity/lib/logger'
35+
import type * as WithSubcommandsModule from '../../../../src/utils/cli/with-subcommands.mjs'
36+
3337
// Mock the logger.
3438
const mockLogger = vi.hoisted(() => ({
3539
error: vi.fn(),
@@ -42,7 +46,7 @@ const mockLogger = vi.hoisted(() => ({
4246

4347
vi.mock('@socketsecurity/lib/logger', async importOriginal => {
4448
const actual =
45-
await importOriginal<typeof import('@socketsecurity/lib/logger')>()
49+
await importOriginal<typeof LoggerModule>()
4650
return {
4751
...actual,
4852
getDefaultLogger: () => mockLogger,
@@ -69,7 +73,7 @@ const mockGetSupportedConfigEntries = vi.hoisted(() =>
6973

7074
vi.mock('../../../../src/utils/config.mts', async importOriginal => {
7175
const actual =
72-
await importOriginal<typeof import('../../../../src/utils/config.mts')>()
76+
await importOriginal<typeof ConfigModule>()
7377
return {
7478
...actual,
7579
getSupportedConfigEntries: mockGetSupportedConfigEntries,
@@ -137,7 +141,7 @@ vi.mock(
137141
async importOriginal => {
138142
const actual =
139143
await importOriginal<
140-
typeof import('../../../../src/utils/cli/with-subcommands.mjs')
144+
typeof WithSubcommandsModule
141145
>()
142146
return {
143147
...actual,
@@ -358,7 +362,7 @@ describe('cmd-config-unset', () => {
358362
// Check that validation includes the conflicting flags check.
359363
const validations = call.slice(1)
360364
const conflictCheck = validations.find(
361-
(v: any) =>
365+
(v: unknown) =>
362366
v.message &&
363367
v.message.includes('--json') &&
364368
v.message.includes('--markdown'),
@@ -487,7 +491,7 @@ describe('cmd-config-unset', () => {
487491

488492
// Should NOT have value validation for unset command.
489493
const valueValidation = validations.find(
490-
(v: any) =>
494+
(v: unknown) =>
491495
v.message &&
492496
(v.message.includes('value') || v.message.includes('unset')),
493497
)

‎packages/cli/test/unit/commands/fix/cmd-fix.test.mts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
import { beforeEach, describe, expect, it, vi } from 'vitest'
99

10+
import type * as LoggerModule from '@socketsecurity/lib/logger'
11+
1012
// Mock the logger.
1113
const mockLogger = vi.hoisted(() => ({
1214
error: vi.fn(),
@@ -19,7 +21,7 @@ const mockLogger = vi.hoisted(() => ({
1921

2022
vi.mock('@socketsecurity/lib/logger', async importOriginal => {
2123
const actual =
22-
await importOriginal<typeof import('@socketsecurity/lib/logger')>()
24+
await importOriginal<typeof LoggerModule>()
2325
return {
2426
...actual,
2527
getDefaultLogger: () => mockLogger,

‎packages/cli/test/unit/commands/fix/env-helpers.test.mts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ vi.mock('@socketsecurity/lib/env/ci', () => ({
3333
const mockGetSocketCliGithubToken = vi.hoisted(() => vi.fn())
3434
vi.mock('@socketsecurity/lib/env/socket-cli', async importOriginal => {
3535
const actual =
36-
(await importOriginal()) as typeof import('@socketsecurity/lib/env/socket-cli')
36+
(await importOriginal()) as typeof SocketCliModule
3737
return {
3838
...actual,
3939
getSocketCliGithubToken: mockGetSocketCliGithubToken,
@@ -95,6 +95,8 @@ import {
9595
getFixEnv,
9696
} from '../../../../src/commands/fix/env-helpers.mts'
9797

98+
import type * as SocketCliModule from '@socketsecurity/lib/env/socket-cli'
99+
98100
describe('env-helpers', () => {
99101
beforeEach(() => {
100102
vi.clearAllMocks()

‎packages/cli/test/unit/commands/fix/ghsa-tracker.test.mts‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ import {
4343

4444
import type { GhsaTracker } from '../../../../src/commands/fix/ghsa-tracker.mts'
4545

46+
import type * as FsModule from 'node:fs'
47+
4648
// Mock file system operations.
4749
const mockReadJson = vi.hoisted(() => vi.fn())
4850
const mockSafeDelete = vi.hoisted(() => vi.fn())
@@ -54,7 +56,7 @@ const mockFsWriteFile = vi.hoisted(() => vi.fn())
5456
const mockFsReadFile = vi.hoisted(() => vi.fn())
5557

5658
vi.mock('node:fs', async () => {
57-
const actual = await vi.importActual<typeof import('node:fs')>('node:fs')
59+
const actual = await vi.importActual<typeof FsModule>('node:fs')
5860
return {
5961
...actual,
6062
promises: {
@@ -87,29 +89,29 @@ describe('ghsa-tracker', () => {
8789

8890
it('returns true when process.kill throws EPERM (alive but no permission)', () => {
8991
const original = process.kill
90-
;(process as any).kill = () => {
92+
;(process as unknown).kill = () => {
9193
const e = new Error('Operation not permitted') as NodeJS.ErrnoException
9294
e.code = 'EPERM'
9395
throw e
9496
}
9597
try {
9698
expect(isPidAlive(1)).toBe(true)
9799
} finally {
98-
;(process as any).kill = original
100+
;(process as unknown).kill = original
99101
}
100102
})
101103

102104
it('returns false when process.kill throws non-EPERM (e.g. EINVAL)', () => {
103105
const original = process.kill
104-
;(process as any).kill = () => {
106+
;(process as unknown).kill = () => {
105107
const e = new Error('Invalid') as NodeJS.ErrnoException
106108
e.code = 'EINVAL'
107109
throw e
108110
}
109111
try {
110112
expect(isPidAlive(1)).toBe(false)
111113
} finally {
112-
;(process as any).kill = original
114+
;(process as unknown).kill = original
113115
}
114116
})
115117
})
@@ -339,7 +341,7 @@ describe('ghsa-tracker', () => {
339341

340342
it('returns false when tracker shape is invalid (fixed.some throws)', async () => {
341343
// Resolve to a malformed tracker so .fixed.some() throws.
342-
mockReadJson.mockResolvedValue({ version: 1 } as any)
344+
mockReadJson.mockResolvedValue({ version: 1 } as unknown)
343345

344346
const result = await isGhsaFixed(mockCwd, 'GHSA-1234-5678-90ab')
345347

‎packages/cli/test/unit/commands/install/cmd-install.test.mts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
import { beforeEach, describe, expect, it, vi } from 'vitest'
99

10+
import type * as WithSubcommandsModule from '../../../../src/utils/cli/with-subcommands.mjs'
11+
1012
// Mock meowWithSubcommands.
1113
const mockMeowWithSubcommands = vi.hoisted(() => vi.fn())
1214

@@ -15,7 +17,7 @@ vi.mock(
1517
async importOriginal => {
1618
const actual =
1719
await importOriginal<
18-
typeof import('../../../../src/utils/cli/with-subcommands.mjs')
20+
typeof WithSubcommandsModule
1921
>()
2022
return {
2123
...actual,

‎packages/cli/test/unit/commands/logout/cmd-logout.test.mts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66

77
import { beforeEach, describe, expect, it, vi } from 'vitest'
88

9+
import type * as ConfigModule from '../../../../src/utils/config.mts'
10+
import type * as LoggerModule from '@socketsecurity/lib/logger'
11+
import type * as WithSubcommandsModule from '../../../../src/utils/cli/with-subcommands.mjs'
12+
913
// Mock the logger.
1014
const mockLogger = vi.hoisted(() => ({
1115
error: vi.fn(),
@@ -18,7 +22,7 @@ const mockLogger = vi.hoisted(() => ({
1822

1923
vi.mock('@socketsecurity/lib/logger', async importOriginal => {
2024
const actual =
21-
await importOriginal<typeof import('@socketsecurity/lib/logger')>()
25+
await importOriginal<typeof LoggerModule>()
2226
return {
2327
...actual,
2428
getDefaultLogger: () => mockLogger,
@@ -31,7 +35,7 @@ const mockIsConfigFromFlag = vi.hoisted(() => vi.fn(() => false))
3135

3236
vi.mock('../../../../src/utils/config.mts', async importOriginal => {
3337
const actual =
34-
await importOriginal<typeof import('../../../../src/utils/config.mts')>()
38+
await importOriginal<typeof ConfigModule>()
3539
return {
3640
...actual,
3741
isConfigFromFlag: mockIsConfigFromFlag,
@@ -51,7 +55,7 @@ vi.mock('../../../../src/utils/dry-run/output.mts', () => ({
5155
// covered; production meowOrExit only invokes it on --help, which
5256
// the test suite never exercises.
5357
const mockMeowOrExit = vi.hoisted(() =>
54-
vi.fn((options: any) => {
58+
vi.fn((options: unknown) => {
5559
const argv = options.argv as string[] | readonly string[]
5660
const flags: Record<string, unknown> = {}
5761

@@ -84,7 +88,7 @@ vi.mock(
8488
async importOriginal => {
8589
const actual =
8690
await importOriginal<
87-
typeof import('../../../../src/utils/cli/with-subcommands.mjs')
91+
typeof WithSubcommandsModule
8892
>()
8993
return {
9094
...actual,

‎packages/cli/test/unit/commands/manifest/cmd-manifest-gradle.test.mts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import path from 'node:path'
88

99
import { beforeEach, describe, expect, it, vi } from 'vitest'
1010

11+
import type * as LoggerModule from '@socketsecurity/lib/logger'
12+
1113
// Mock the logger.
1214
const mockLogger = vi.hoisted(() => ({
1315
error: vi.fn(),
@@ -22,7 +24,7 @@ const mockLogger = vi.hoisted(() => ({
2224

2325
vi.mock('@socketsecurity/lib/logger', async importOriginal => {
2426
const actual =
25-
await importOriginal<typeof import('@socketsecurity/lib/logger')>()
27+
await importOriginal<typeof LoggerModule>()
2628
return {
2729
...actual,
2830
getDefaultLogger: () => mockLogger,

‎packages/cli/test/unit/commands/manifest/cmd-manifest-kotlin.test.mts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import path from 'node:path'
88

99
import { beforeEach, describe, expect, it, vi } from 'vitest'
1010

11+
import type * as LoggerModule from '@socketsecurity/lib/logger'
12+
1113
// Mock the logger.
1214
const mockLogger = vi.hoisted(() => ({
1315
error: vi.fn(),
@@ -22,7 +24,7 @@ const mockLogger = vi.hoisted(() => ({
2224

2325
vi.mock('@socketsecurity/lib/logger', async importOriginal => {
2426
const actual =
25-
await importOriginal<typeof import('@socketsecurity/lib/logger')>()
27+
await importOriginal<typeof LoggerModule>()
2628
return {
2729
...actual,
2830
getDefaultLogger: () => mockLogger,

0 commit comments

Comments
 (0)