mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-03-14 17:37:46 +00:00
[backport core/1.33] fix: don't use registry when only checking for presence of missing nodes (#6974)
## Summary
Backport of #6965 onto core/1.33 (clean cherry-pick of 83f04490b).
## Testing
- pnpm typecheck
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6974-backport-core-1-33-fix-don-t-use-registry-when-only-checking-for-presence-of-missing-n-2b86d73d3650813dac37e224f857f296)
by [Unito](https://www.unito.io)
This commit is contained in:
@@ -0,0 +1,115 @@
|
||||
import { describe, expect, it } from 'vitest'
|
||||
|
||||
import type {
|
||||
LGraph,
|
||||
LGraphNode,
|
||||
Subgraph
|
||||
} from '@/lib/litegraph/src/litegraph'
|
||||
import {
|
||||
collectMissingNodes,
|
||||
graphHasMissingNodes
|
||||
} from '@/workbench/extensions/manager/utils/graphHasMissingNodes'
|
||||
import type { NodeDefLookup } from '@/workbench/extensions/manager/utils/graphHasMissingNodes'
|
||||
import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
|
||||
|
||||
type NodeDefs = NodeDefLookup
|
||||
|
||||
let nodeIdCounter = 0
|
||||
const mockNodeDef = {} as ComfyNodeDefImpl
|
||||
|
||||
const createGraph = (nodes: LGraphNode[] = []): LGraph => {
|
||||
return { nodes } as Partial<LGraph> as LGraph
|
||||
}
|
||||
|
||||
const createSubgraph = (nodes: LGraphNode[]): Subgraph => {
|
||||
return { nodes } as Partial<Subgraph> as Subgraph
|
||||
}
|
||||
|
||||
const createNode = (
|
||||
type?: string,
|
||||
subgraphNodes?: LGraphNode[]
|
||||
): LGraphNode => {
|
||||
return {
|
||||
id: nodeIdCounter++,
|
||||
type,
|
||||
isSubgraphNode: subgraphNodes ? () => true : undefined,
|
||||
subgraph: subgraphNodes ? createSubgraph(subgraphNodes) : undefined
|
||||
} as unknown as LGraphNode
|
||||
}
|
||||
|
||||
describe('graphHasMissingNodes', () => {
|
||||
it('returns false when graph is null', () => {
|
||||
expect(graphHasMissingNodes(null, {})).toBe(false)
|
||||
})
|
||||
|
||||
it('returns false when graph is undefined', () => {
|
||||
expect(graphHasMissingNodes(undefined, {})).toBe(false)
|
||||
})
|
||||
|
||||
it('returns false when graph has no nodes', () => {
|
||||
expect(graphHasMissingNodes(createGraph(), {})).toBe(false)
|
||||
})
|
||||
|
||||
it('returns false when every node has a definition', () => {
|
||||
const graph = createGraph([createNode('FooNode'), createNode('BarNode')])
|
||||
const nodeDefs: NodeDefs = {
|
||||
FooNode: mockNodeDef,
|
||||
BarNode: mockNodeDef
|
||||
}
|
||||
|
||||
expect(graphHasMissingNodes(graph, nodeDefs)).toBe(false)
|
||||
})
|
||||
|
||||
it('returns true when at least one node is missing', () => {
|
||||
const graph = createGraph([
|
||||
createNode('FooNode'),
|
||||
createNode('MissingNode')
|
||||
])
|
||||
const nodeDefs: NodeDefs = {
|
||||
FooNode: mockNodeDef
|
||||
}
|
||||
|
||||
expect(graphHasMissingNodes(graph, nodeDefs)).toBe(true)
|
||||
})
|
||||
|
||||
it('checks nodes nested in subgraphs', () => {
|
||||
const graph = createGraph([
|
||||
createNode('ContainerNode', [createNode('InnerMissing')])
|
||||
])
|
||||
const nodeDefs: NodeDefs = {
|
||||
ContainerNode: mockNodeDef
|
||||
}
|
||||
|
||||
const missingNodes = collectMissingNodes(graph, nodeDefs)
|
||||
expect(missingNodes).toHaveLength(1)
|
||||
expect(missingNodes[0]?.type).toBe('InnerMissing')
|
||||
})
|
||||
|
||||
it('ignores nodes without a type', () => {
|
||||
const graph = createGraph([
|
||||
createNode(undefined),
|
||||
createNode(null as unknown as string)
|
||||
])
|
||||
|
||||
expect(graphHasMissingNodes(graph, {})).toBe(false)
|
||||
})
|
||||
|
||||
it('traverses deeply nested subgraphs', () => {
|
||||
const deepGraph = createGraph([
|
||||
createNode('Layer1', [
|
||||
createNode('Layer2', [
|
||||
createNode('Layer3', [createNode('MissingDeep')])
|
||||
])
|
||||
])
|
||||
])
|
||||
const nodeDefs: NodeDefs = {
|
||||
Layer1: mockNodeDef,
|
||||
Layer2: mockNodeDef,
|
||||
Layer3: mockNodeDef
|
||||
}
|
||||
|
||||
const missingNodes = collectMissingNodes(deepGraph, nodeDefs)
|
||||
expect(missingNodes).toHaveLength(1)
|
||||
expect(missingNodes[0]?.type).toBe('MissingDeep')
|
||||
})
|
||||
})
|
||||
Reference in New Issue
Block a user