mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-26 01:34:07 +00:00
Road to No explicit any: Group 8 (part 6) test files (#8344)
## Summary
This PR removes unsafe type assertions ("as unknown as Type") from test
files and improves type safety across the codebase.
### Key Changes
#### Type Safety Improvements
- Removed all instances of "as unknown as" patterns from test files
- Used proper factory functions from litegraphTestUtils instead of
custom mocks
- Made incomplete mocks explicit using Partial<T> types
- Fixed DialogStore mocking with proper interface exports
- Improved type safety with satisfies operator where applicable
#### App Parameter Removal
- **Removed the unused `app` parameter from all ComfyExtension interface
methods**
- The app parameter was always undefined at runtime as it was never
passed from invokeExtensions
- Affected methods: init, setup, addCustomNodeDefs,
beforeRegisterNodeDef, beforeRegisterVueAppNodeDefs,
registerCustomNodes, loadedGraphNode, nodeCreated, beforeConfigureGraph,
afterConfigureGraph
##### Breaking Change Analysis
Verified via Sourcegraph that this is NOT a breaking change:
- Searched all 10 affected methods across GitHub repositories
- Only one external repository
([drawthingsai/draw-things-comfyui](https://github.com/drawthingsai/draw-things-comfyui))
declares the app parameter in their extension methods
- That repository never actually uses the app parameter (just declares
it in the function signature)
- All other repositories already omit the app parameter
- Search queries used:
- [init method
search](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/.*+lang:typescript+%22init%28app%22+-repo:Comfy-Org/ComfyUI_frontend&patternType=standard)
- [setup method
search](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/.*+lang:typescript+%22setup%28app%22+-repo:Comfy-Org/ComfyUI_frontend&patternType=standard)
- Similar searches for all 10 methods confirmed no usage
### Files Changed
Test files:
-
src/components/settings/widgets/__tests__/WidgetInputNumberInput.test.ts
- src/services/keybindingService.escape.test.ts
- src/services/keybindingService.forwarding.test.ts
- src/utils/__tests__/newUserService.test.ts →
src/utils/__tests__/useNewUserService.test.ts
- src/services/jobOutputCache.test.ts
-
src/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.test.ts
-
src/renderer/extensions/vueNodes/widgets/composables/useIntWidget.test.ts
-
src/renderer/extensions/vueNodes/widgets/composables/useFloatWidget.test.ts
Source files:
- src/types/comfy.ts - Removed app parameter from ComfyExtension
interface
- src/services/extensionService.ts - Improved type safety with
FunctionPropertyNames helper
- src/scripts/metadata/isobmff.ts - Fixed extractJson return type per
review
- src/extensions/core/*.ts - Updated extension implementations
- src/scripts/app.ts - Updated app initialization
### Testing
- All existing tests pass
- Type checking passes
- ESLint/oxlint checks pass
- No breaking changes for external repositories
Part of the "Road to No Explicit Any" initiative.
### Previous PRs in this series:
- Part 2: #7401
- Part 3: #7935
- Part 4: #7970
- Part 5: #8064
- Part 6: #8083
- Part 7: #8092
- Part 8 Group 1: #8253
- Part 8 Group 2: #8258
- Part 8 Group 3: #8304
- Part 8 Group 4: #8314
- Part 8 Group 5: #8329
- Part 8 Group 6: #8344 (this PR)
This commit is contained in:
committed by
GitHub
parent
868180eb28
commit
cabd08f0ec
@@ -76,7 +76,7 @@ vi.mock(
|
||||
executing: computed(() => mockData.mockExecuting),
|
||||
progress: computed(() => undefined),
|
||||
progressPercentage: computed(() => undefined),
|
||||
progressState: computed(() => undefined as any),
|
||||
progressState: computed(() => undefined),
|
||||
executionState: computed(() => 'idle' as const)
|
||||
}))
|
||||
})
|
||||
|
||||
@@ -290,7 +290,7 @@ describe('WidgetGalleria Image Display', () => {
|
||||
await galleria.vm.$emit('update:activeIndex', 2)
|
||||
|
||||
// Check that the internal activeIndex ref was updated
|
||||
const vm = wrapper.vm as any
|
||||
const vm = wrapper.vm as typeof wrapper.vm & { activeIndex: number }
|
||||
expect(vm.activeIndex).toBe(2)
|
||||
})
|
||||
})
|
||||
|
||||
@@ -197,13 +197,12 @@ describe('WidgetInputNumberInput Large Integer Precision Handling', () => {
|
||||
describe('WidgetInputNumberInput Edge Cases for Precision Handling', () => {
|
||||
it('handles null/undefined model values gracefully', () => {
|
||||
const widget = createMockWidget(0, 'int')
|
||||
// Mount with undefined as modelValue
|
||||
const wrapper = mount(WidgetInputNumberInput, {
|
||||
global: { plugins: [i18n] },
|
||||
props: {
|
||||
widget,
|
||||
modelValue: undefined as any
|
||||
}
|
||||
modelValue: undefined
|
||||
} as { widget: SimplifiedWidget<number>; modelValue: number | undefined }
|
||||
})
|
||||
|
||||
expect(wrapper.findAll('button').length).toBe(2)
|
||||
|
||||
@@ -8,7 +8,7 @@ describe('FormSelectButton Core Component', () => {
|
||||
// Type-safe helper for mounting component
|
||||
const mountComponent = (
|
||||
modelValue: string | null | undefined = null,
|
||||
options: (string | number | Record<string, any>)[] = [],
|
||||
options: unknown[] = [],
|
||||
props: Record<string, unknown> = {}
|
||||
) => {
|
||||
return mount(FormSelectButton, {
|
||||
@@ -17,7 +17,11 @@ describe('FormSelectButton Core Component', () => {
|
||||
},
|
||||
props: {
|
||||
modelValue,
|
||||
options: options as any,
|
||||
options: options as (
|
||||
| string
|
||||
| number
|
||||
| { label: string; value: string | number }
|
||||
)[],
|
||||
...props
|
||||
}
|
||||
})
|
||||
@@ -474,7 +478,7 @@ describe('FormSelectButton Core Component', () => {
|
||||
})
|
||||
|
||||
it('handles mixed type options safely', () => {
|
||||
const mixedOptions: any[] = [
|
||||
const mixedOptions: unknown[] = [
|
||||
'string',
|
||||
123,
|
||||
{ label: 'Object', value: 'obj' }
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
|
||||
import type { INumericWidget } from '@/lib/litegraph/src/types/widgets'
|
||||
import { _for_testing } from '@/renderer/extensions/vueNodes/widgets/composables/useFloatWidget'
|
||||
|
||||
vi.mock('@/scripts/widgets', () => ({
|
||||
@@ -16,14 +17,17 @@ const { onFloatValueChange } = _for_testing
|
||||
|
||||
describe('useFloatWidget', () => {
|
||||
describe('onFloatValueChange', () => {
|
||||
let widget: any
|
||||
let widget: INumericWidget
|
||||
|
||||
beforeEach(() => {
|
||||
// Reset the widget before each test
|
||||
widget = {
|
||||
type: 'number',
|
||||
name: 'test_widget',
|
||||
y: 0,
|
||||
options: {},
|
||||
value: 0
|
||||
}
|
||||
} as Partial<INumericWidget> as INumericWidget
|
||||
})
|
||||
|
||||
it('should not round values when round option is not set', () => {
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
|
||||
import type { INumericWidget } from '@/lib/litegraph/src/types/widgets'
|
||||
import { _for_testing } from '@/renderer/extensions/vueNodes/widgets/composables/useIntWidget'
|
||||
|
||||
vi.mock('@/scripts/widgets', () => ({
|
||||
@@ -16,14 +17,17 @@ const { onValueChange } = _for_testing
|
||||
|
||||
describe('useIntWidget', () => {
|
||||
describe('onValueChange', () => {
|
||||
let widget: any
|
||||
let widget: INumericWidget
|
||||
|
||||
beforeEach(() => {
|
||||
// Reset the widget before each test
|
||||
widget = {
|
||||
type: 'number',
|
||||
name: 'test_widget',
|
||||
y: 0,
|
||||
options: {},
|
||||
value: 0
|
||||
}
|
||||
} as Partial<INumericWidget> as INumericWidget
|
||||
})
|
||||
|
||||
it('should round values based on step size', () => {
|
||||
|
||||
@@ -3,19 +3,20 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
|
||||
import type { IWidget } from '@/lib/litegraph/src/litegraph'
|
||||
import { api } from '@/scripts/api'
|
||||
import { LGraphNode } from '@/lib/litegraph/src/litegraph'
|
||||
import { useRemoteWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget'
|
||||
import type { RemoteWidgetConfig } from '@/schemas/nodeDefSchema'
|
||||
import { createMockLGraphNode } from '@/utils/__tests__/litegraphTestUtils'
|
||||
|
||||
const createMockNode = (overrides: Partial<LGraphNode> = {}): LGraphNode => {
|
||||
const node = new LGraphNode('TestNode')
|
||||
Object.assign(node, overrides)
|
||||
return node
|
||||
function createMockWidget(overrides: Partial<IWidget> = {}): IWidget {
|
||||
return {
|
||||
name: 'test_widget',
|
||||
type: 'text',
|
||||
value: '',
|
||||
options: {},
|
||||
...overrides
|
||||
} as Partial<IWidget> as IWidget
|
||||
}
|
||||
|
||||
const createMockWidget = (overrides = {}): IWidget =>
|
||||
({ ...overrides }) as unknown as IWidget
|
||||
|
||||
const mockCloudAuth = vi.hoisted(() => ({
|
||||
isCloud: false,
|
||||
authHeader: null as { Authorization: string } | null
|
||||
@@ -67,7 +68,10 @@ function createMockConfig(overrides = {}): RemoteWidgetConfig {
|
||||
const createMockOptions = (inputOverrides = {}) => ({
|
||||
remoteConfig: createMockConfig(inputOverrides),
|
||||
defaultValue: DEFAULT_VALUE,
|
||||
node: createMockNode(),
|
||||
node: createMockLGraphNode({
|
||||
addWidget: vi.fn(() => createMockWidget()),
|
||||
onRemoved: undefined
|
||||
}),
|
||||
widget: createMockWidget()
|
||||
})
|
||||
|
||||
@@ -499,12 +503,14 @@ describe('useRemoteWidget', () => {
|
||||
})
|
||||
|
||||
it('should handle rapid cache clearing during fetch', async () => {
|
||||
let resolvePromise: (value: any) => void
|
||||
const delayedPromise = new Promise((resolve) => {
|
||||
resolvePromise = resolve
|
||||
})
|
||||
let resolvePromise: (value: { data: unknown; status?: number }) => void
|
||||
const delayedPromise = new Promise<{ data: unknown; status?: number }>(
|
||||
(resolve) => {
|
||||
resolvePromise = resolve
|
||||
}
|
||||
)
|
||||
|
||||
vi.mocked(axios.get).mockImplementationOnce(() => delayedPromise as any)
|
||||
vi.mocked(axios.get).mockImplementationOnce(() => delayedPromise)
|
||||
|
||||
const hook = useRemoteWidget(createMockOptions())
|
||||
hook.getValue()
|
||||
@@ -520,17 +526,20 @@ describe('useRemoteWidget', () => {
|
||||
})
|
||||
|
||||
it('should handle widget destroyed during fetch', async () => {
|
||||
let resolvePromise: (value: any) => void
|
||||
const delayedPromise = new Promise((resolve) => {
|
||||
resolvePromise = resolve
|
||||
})
|
||||
let resolvePromise: (value: { data: unknown; status?: number }) => void
|
||||
const delayedPromise = new Promise<{ data: unknown; status?: number }>(
|
||||
(resolve) => {
|
||||
resolvePromise = resolve
|
||||
}
|
||||
)
|
||||
|
||||
vi.mocked(axios.get).mockImplementationOnce(() => delayedPromise as any)
|
||||
vi.mocked(axios.get).mockImplementationOnce(() => delayedPromise)
|
||||
|
||||
let hook = useRemoteWidget(createMockOptions())
|
||||
let hook: ReturnType<typeof useRemoteWidget> | null =
|
||||
useRemoteWidget(createMockOptions())
|
||||
const fetchPromise = hook.getValue()
|
||||
|
||||
hook = null as any
|
||||
hook = null
|
||||
|
||||
resolvePromise!({ data: ['delayed data'] })
|
||||
await fetchPromise
|
||||
@@ -583,19 +592,19 @@ describe('useRemoteWidget', () => {
|
||||
|
||||
describe('auto-refresh on task completion', () => {
|
||||
it('should add auto-refresh toggle widget', () => {
|
||||
const mockNode = {
|
||||
const mockNode = createMockLGraphNode({
|
||||
addWidget: vi.fn(),
|
||||
widgets: []
|
||||
}
|
||||
const mockWidget = {
|
||||
})
|
||||
const mockWidget = createMockWidget({
|
||||
refresh: vi.fn()
|
||||
}
|
||||
})
|
||||
|
||||
useRemoteWidget({
|
||||
remoteConfig: createMockConfig(),
|
||||
defaultValue: DEFAULT_VALUE,
|
||||
node: mockNode as any,
|
||||
widget: mockWidget as any
|
||||
node: mockNode,
|
||||
widget: mockWidget
|
||||
})
|
||||
|
||||
// Should add auto-refresh toggle widget
|
||||
@@ -613,19 +622,19 @@ describe('useRemoteWidget', () => {
|
||||
it('should register event listener when enabled', async () => {
|
||||
const addEventListenerSpy = vi.spyOn(api, 'addEventListener')
|
||||
|
||||
const mockNode = {
|
||||
const mockNode = createMockLGraphNode({
|
||||
addWidget: vi.fn(),
|
||||
widgets: []
|
||||
}
|
||||
const mockWidget = {
|
||||
})
|
||||
const mockWidget = createMockWidget({
|
||||
refresh: vi.fn()
|
||||
}
|
||||
})
|
||||
|
||||
useRemoteWidget({
|
||||
remoteConfig: createMockConfig(),
|
||||
defaultValue: DEFAULT_VALUE,
|
||||
node: mockNode as any,
|
||||
widget: mockWidget as any
|
||||
node: mockNode,
|
||||
widget: mockWidget
|
||||
})
|
||||
|
||||
// Event listener should be registered immediately
|
||||
@@ -644,16 +653,16 @@ describe('useRemoteWidget', () => {
|
||||
}
|
||||
})
|
||||
|
||||
const mockNode = {
|
||||
const mockNode = createMockLGraphNode({
|
||||
addWidget: vi.fn(),
|
||||
widgets: []
|
||||
}
|
||||
const mockWidget = {} as any
|
||||
})
|
||||
const mockWidget = createMockWidget({})
|
||||
|
||||
useRemoteWidget({
|
||||
remoteConfig: createMockConfig(),
|
||||
defaultValue: DEFAULT_VALUE,
|
||||
node: mockNode as any,
|
||||
node: mockNode,
|
||||
widget: mockWidget
|
||||
})
|
||||
|
||||
@@ -661,8 +670,9 @@ describe('useRemoteWidget', () => {
|
||||
const refreshSpy = vi.spyOn(mockWidget, 'refresh')
|
||||
|
||||
// Get the toggle callback and enable auto-refresh
|
||||
const toggleCallback = mockNode.addWidget.mock.calls.find(
|
||||
(call) => call[0] === 'toggle'
|
||||
const addWidgetMock = mockNode.addWidget as ReturnType<typeof vi.fn>
|
||||
const toggleCallback = addWidgetMock.mock.calls.find(
|
||||
(call: unknown[]) => call[0] === 'toggle'
|
||||
)?.[3]
|
||||
toggleCallback?.(true)
|
||||
|
||||
@@ -681,16 +691,16 @@ describe('useRemoteWidget', () => {
|
||||
}
|
||||
})
|
||||
|
||||
const mockNode = {
|
||||
const mockNode = createMockLGraphNode({
|
||||
addWidget: vi.fn(),
|
||||
widgets: []
|
||||
}
|
||||
const mockWidget = {} as any
|
||||
})
|
||||
const mockWidget = createMockWidget({})
|
||||
|
||||
useRemoteWidget({
|
||||
remoteConfig: createMockConfig(),
|
||||
defaultValue: DEFAULT_VALUE,
|
||||
node: mockNode as any,
|
||||
node: mockNode,
|
||||
widget: mockWidget
|
||||
})
|
||||
|
||||
@@ -715,20 +725,20 @@ describe('useRemoteWidget', () => {
|
||||
|
||||
const removeEventListenerSpy = vi.spyOn(api, 'removeEventListener')
|
||||
|
||||
const mockNode = {
|
||||
const mockNode = createMockLGraphNode({
|
||||
addWidget: vi.fn(),
|
||||
widgets: [],
|
||||
onRemoved: undefined as any
|
||||
}
|
||||
const mockWidget = {
|
||||
onRemoved: undefined
|
||||
})
|
||||
const mockWidget = createMockWidget({
|
||||
refresh: vi.fn()
|
||||
}
|
||||
})
|
||||
|
||||
useRemoteWidget({
|
||||
remoteConfig: createMockConfig(),
|
||||
defaultValue: DEFAULT_VALUE,
|
||||
node: mockNode as any,
|
||||
widget: mockWidget as any
|
||||
node: mockNode,
|
||||
widget: mockWidget
|
||||
})
|
||||
|
||||
// Simulate node removal
|
||||
|
||||
Reference in New Issue
Block a user