mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-02 22:37:32 +00:00
## 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 improper `as unknown as Type` patterns from 17 test files in
Group 8 part 7
- Replaced with proper TypeScript patterns using factory functions and
Mock types
- Fixed createTestingPinia usage in test files (was incorrectly using
createPinia)
- Fixed vi.hoisted pattern for mockSetDirty in viewport tests
- Fixed vi.doMock lint issues with vi.mock and vi.hoisted pattern
- Retained necessary `as unknown as` casts only for complex mock objects
where direct type assertions would fail
### Files Changed
Test files (Group 8 part 7 - services, stores, utils):
- src/services/nodeOrganizationService.test.ts
- src/services/providers/algoliaSearchProvider.test.ts
- src/services/providers/registrySearchProvider.test.ts
- src/stores/comfyRegistryStore.test.ts
- src/stores/domWidgetStore.test.ts
- src/stores/executionStore.test.ts
- src/stores/firebaseAuthStore.test.ts
- src/stores/modelToNodeStore.test.ts
- src/stores/queueStore.test.ts
- src/stores/subgraphNavigationStore.test.ts
- src/stores/subgraphNavigationStore.viewport.test.ts
- src/stores/subgraphStore.test.ts
- src/stores/systemStatsStore.test.ts
- src/stores/workspace/nodeHelpStore.test.ts
- src/utils/colorUtil.test.ts
- src/utils/executableGroupNodeChildDTO.test.ts
Source files:
- src/stores/modelStore.ts - Improved type handling
### Testing
- All TypeScript type checking passes (`pnpm typecheck`)
- All affected test files pass (`pnpm test:unit`)
- Linting passes without errors (`pnpm lint`)
- Code formatting applied (`pnpm format`)
Part of the "Road to No Explicit Any" initiative, cleaning up type
casting issues from branch `fix/remove-any-types-part8`.
### 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
- Part 8 Group 7: #8459 (this PR)
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-8459-Road-to-No-explicit-any-Group-8-part-7-test-files-2f86d73d36508114ad28d82e72a3a5e9)
by [Unito](https://www.unito.io)
196 lines
6.3 KiB
TypeScript
196 lines
6.3 KiB
TypeScript
import { createTestingPinia } from '@pinia/testing'
|
|
import { setActivePinia } from 'pinia'
|
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import { nextTick } from 'vue'
|
|
|
|
import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
|
|
import type { ComfyWorkflow } from '@/platform/workflow/management/stores/workflowStore'
|
|
import { app } from '@/scripts/app'
|
|
import { useSubgraphNavigationStore } from '@/stores/subgraphNavigationStore'
|
|
import { createMockChangeTracker } from '@/utils/__tests__/litegraphTestUtils'
|
|
|
|
import type { Subgraph } from '@/lib/litegraph/src/LGraph'
|
|
|
|
vi.mock('@/scripts/app', () => {
|
|
const mockCanvas = {
|
|
subgraph: null,
|
|
ds: {
|
|
scale: 1,
|
|
offset: [0, 0],
|
|
state: {
|
|
scale: 1,
|
|
offset: [0, 0]
|
|
}
|
|
},
|
|
setDirty: vi.fn()
|
|
}
|
|
|
|
return {
|
|
app: {
|
|
graph: {
|
|
_nodes: [],
|
|
nodes: [],
|
|
subgraphs: new Map(),
|
|
getNodeById: vi.fn()
|
|
},
|
|
canvas: mockCanvas
|
|
}
|
|
}
|
|
})
|
|
|
|
vi.mock('@/renderer/core/canvas/canvasStore', () => ({
|
|
useCanvasStore: () => ({
|
|
getCanvas: () => app.canvas
|
|
})
|
|
}))
|
|
|
|
vi.mock('@/utils/graphTraversalUtil', () => ({
|
|
findSubgraphPathById: vi.fn()
|
|
}))
|
|
|
|
describe('useSubgraphNavigationStore', () => {
|
|
beforeEach(() => {
|
|
setActivePinia(createTestingPinia({ stubActions: false }))
|
|
})
|
|
|
|
it('should not clear navigation stack when workflow internal state changes', async () => {
|
|
const navigationStore = useSubgraphNavigationStore()
|
|
const workflowStore = useWorkflowStore()
|
|
|
|
// Mock a workflow
|
|
const mockWorkflow = {
|
|
path: 'test-workflow.json',
|
|
filename: 'test-workflow.json',
|
|
changeTracker: null
|
|
} as ComfyWorkflow
|
|
|
|
// Set the active workflow (cast to bypass TypeScript check in test)
|
|
workflowStore.activeWorkflow =
|
|
mockWorkflow as typeof workflowStore.activeWorkflow
|
|
|
|
// Simulate being in a subgraph by restoring state
|
|
navigationStore.restoreState(['subgraph-1', 'subgraph-2'])
|
|
|
|
expect(navigationStore.exportState()).toHaveLength(2)
|
|
|
|
// Simulate a change to the workflow's internal state
|
|
// (e.g., changeTracker.activeState being reassigned)
|
|
mockWorkflow.changeTracker = {
|
|
activeState: {}
|
|
} as typeof mockWorkflow.changeTracker
|
|
|
|
// The navigation stack should NOT be cleared because the path hasn't changed
|
|
expect(navigationStore.exportState()).toHaveLength(2)
|
|
expect(navigationStore.exportState()).toEqual(['subgraph-1', 'subgraph-2'])
|
|
})
|
|
|
|
it('should preserve navigation stack per workflow', async () => {
|
|
const navigationStore = useSubgraphNavigationStore()
|
|
const workflowStore = useWorkflowStore()
|
|
|
|
// Mock first workflow
|
|
const workflow1 = {
|
|
path: 'workflow1.json',
|
|
filename: 'workflow1.json',
|
|
changeTracker: createMockChangeTracker({
|
|
restore: vi.fn(),
|
|
store: vi.fn()
|
|
})
|
|
} as Partial<ComfyWorkflow> as ComfyWorkflow
|
|
|
|
// Set the active workflow
|
|
workflowStore.activeWorkflow =
|
|
workflow1 as typeof workflowStore.activeWorkflow
|
|
|
|
// Simulate the restore process that happens when loading a workflow
|
|
// Since subgraphState is private, we'll simulate the effect by directly restoring navigation
|
|
navigationStore.restoreState(['subgraph-1', 'subgraph-2'])
|
|
|
|
// Verify navigation was set
|
|
expect(navigationStore.exportState()).toHaveLength(2)
|
|
expect(navigationStore.exportState()).toEqual(['subgraph-1', 'subgraph-2'])
|
|
|
|
// Switch to a different workflow with no subgraph state (root level)
|
|
const workflow2 = {
|
|
path: 'workflow2.json',
|
|
filename: 'workflow2.json',
|
|
changeTracker: createMockChangeTracker({
|
|
restore: vi.fn(),
|
|
store: vi.fn()
|
|
})
|
|
} as Partial<ComfyWorkflow> as ComfyWorkflow
|
|
|
|
workflowStore.activeWorkflow =
|
|
workflow2 as typeof workflowStore.activeWorkflow
|
|
|
|
// Simulate the restore process for workflow2
|
|
// Since subgraphState is private, we'll simulate the effect by directly restoring navigation
|
|
navigationStore.restoreState([])
|
|
|
|
// The navigation stack should be empty for workflow2 (at root level)
|
|
expect(navigationStore.exportState()).toHaveLength(0)
|
|
|
|
// Switch back to workflow1
|
|
workflowStore.activeWorkflow =
|
|
workflow1 as typeof workflowStore.activeWorkflow
|
|
|
|
// Simulate the restore process for workflow1 again
|
|
// Since subgraphState is private, we'll simulate the effect by directly restoring navigation
|
|
navigationStore.restoreState(['subgraph-1', 'subgraph-2'])
|
|
|
|
// The navigation stack should be restored for workflow1
|
|
expect(navigationStore.exportState()).toHaveLength(2)
|
|
expect(navigationStore.exportState()).toEqual(['subgraph-1', 'subgraph-2'])
|
|
})
|
|
|
|
it('should clear navigation when activeSubgraph becomes undefined', async () => {
|
|
const navigationStore = useSubgraphNavigationStore()
|
|
const workflowStore = useWorkflowStore()
|
|
const { findSubgraphPathById } = await import('@/utils/graphTraversalUtil')
|
|
|
|
// Create mock subgraph and graph structure
|
|
const mockSubgraph = {
|
|
id: 'subgraph-1',
|
|
rootGraph: app.graph,
|
|
_nodes: [],
|
|
nodes: []
|
|
} as Partial<Subgraph> as Subgraph
|
|
|
|
// Add the subgraph to the graph's subgraphs map
|
|
app.graph.subgraphs.set('subgraph-1', mockSubgraph)
|
|
|
|
// First set an active workflow
|
|
const mockWorkflow = {
|
|
path: 'test-workflow.json',
|
|
filename: 'test-workflow.json'
|
|
} as ComfyWorkflow
|
|
|
|
workflowStore.activeWorkflow =
|
|
mockWorkflow as typeof workflowStore.activeWorkflow
|
|
|
|
// Mock findSubgraphPathById to return the correct path
|
|
vi.mocked(findSubgraphPathById).mockReturnValue(['subgraph-1'])
|
|
|
|
// Set canvas.subgraph and trigger update to set activeSubgraph
|
|
app.canvas.subgraph = mockSubgraph
|
|
workflowStore.updateActiveGraph()
|
|
|
|
// Wait for Vue's reactivity to process the change
|
|
await nextTick()
|
|
|
|
// Verify navigation was set by the watcher
|
|
expect(navigationStore.exportState()).toHaveLength(1)
|
|
expect(navigationStore.exportState()).toEqual(['subgraph-1'])
|
|
|
|
// Clear canvas.subgraph and trigger update (simulating navigating back to root)
|
|
app.canvas.subgraph = undefined
|
|
workflowStore.updateActiveGraph()
|
|
|
|
// Wait for Vue's reactivity to process the change
|
|
await nextTick()
|
|
|
|
// Stack should be cleared when activeSubgraph becomes undefined
|
|
expect(navigationStore.exportState()).toHaveLength(0)
|
|
})
|
|
})
|