mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-07-17 09:18:26 +00:00
## Summary Adds a branded local `NodeId` helper and starts separating local node identity from serialized workflow IDs. ## Changes - **What**: Adds central `NodeId` parsing/branding helpers, migrates nearby widget identity types, keeps queue results at the serialized boundary, and removes misleading workflow `NodeId` usage from execution error maps. ## Review Focus Check that the first migration slice keeps serialized/API IDs as raw `number | string` while local UI/store IDs use the branded string type. ## Caveat `SUBGRAPH_INPUT_ID` and `SUBGRAPH_OUTPUT_ID` are now branded local `NodeId` string values internally instead of numeric sentinels. Reviewers should double-check extension compatibility for callers that import `Constants` and compare those values numerically. ## Screenshots (if applicable) N/A --------- Co-authored-by: GitHub Action <action@github.com> Co-authored-by: AustinMroz <austin@comfy.org> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
298 lines
8.9 KiB
TypeScript
298 lines
8.9 KiB
TypeScript
import { defineStore } from 'pinia'
|
|
import { ref, computed, watch } from 'vue'
|
|
import { useEventListener } from '@vueuse/core'
|
|
|
|
import { useEmptyWorkflowDialog } from '@/components/builder/useEmptyWorkflowDialog'
|
|
import { useAppMode } from '@/composables/useAppMode'
|
|
import { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
|
|
import type {
|
|
InputWidgetConfig,
|
|
LinearData,
|
|
LinearInput
|
|
} from '@/platform/workflow/management/stores/comfyWorkflow'
|
|
import { useSettingStore } from '@/platform/settings/settingStore'
|
|
import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
|
|
import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
|
|
import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
|
|
import { app } from '@/scripts/app'
|
|
import { ChangeTracker } from '@/scripts/changeTracker'
|
|
import { resolveSubgraphInputTarget } from '@/core/graph/subgraph/resolveSubgraphInputTarget'
|
|
import type { LGraph } from '@/lib/litegraph/src/litegraph'
|
|
import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
|
|
import {
|
|
getWidgetIdForNode,
|
|
resolveNode,
|
|
resolveNodeWidget
|
|
} from '@/utils/litegraphUtil'
|
|
import { parseNodeId } from '@/types/nodeId'
|
|
import type { NodeId } from '@/types/nodeId'
|
|
import type { WidgetId } from '@/types/widgetId'
|
|
import { isWidgetId, parseWidgetId } from '@/types/widgetId'
|
|
|
|
function findWidgetByEntityId(
|
|
rootGraph: LGraph,
|
|
widgetId: WidgetId
|
|
): IBaseWidget | undefined {
|
|
for (const node of rootGraph.nodes) {
|
|
const widget = node.widgets?.find(
|
|
(w) => getWidgetIdForNode(node, w) === widgetId
|
|
)
|
|
if (widget) return widget
|
|
}
|
|
return undefined
|
|
}
|
|
|
|
export function nodeTypeValidForApp(type: string) {
|
|
return !['Note', 'MarkdownNote'].includes(type)
|
|
}
|
|
|
|
export const useAppModeStore = defineStore('appMode', () => {
|
|
const { getCanvas } = useCanvasStore()
|
|
const settingStore = useSettingStore()
|
|
const workflowStore = useWorkflowStore()
|
|
const { mode, setMode, isBuilderMode, isSelectMode } = useAppMode()
|
|
const emptyWorkflowDialog = useEmptyWorkflowDialog()
|
|
|
|
const showVueNodeSwitchPopup = ref(false)
|
|
|
|
const selectedInputs = ref<LinearInput[]>([])
|
|
const selectedOutputs = ref<NodeId[]>([])
|
|
const hasOutputs = computed(() => !!selectedOutputs.value.length)
|
|
const hasNodes = computed(() => {
|
|
// Nodes are not reactive, so trigger recomputation when workflow changes
|
|
void workflowStore.activeWorkflow
|
|
void mode.value
|
|
return !!app.rootGraph?.nodes?.length
|
|
})
|
|
|
|
function pruneLinearData(data: Partial<LinearData> | undefined): {
|
|
inputs: LinearInput[]
|
|
outputs: NodeId[]
|
|
} {
|
|
const rawInputs = data?.inputs ?? []
|
|
const rawOutputs = data?.outputs ?? []
|
|
const rootGraph = app.rootGraph
|
|
if (!rootGraph) {
|
|
return {
|
|
inputs: rawInputs,
|
|
outputs: rawOutputs.flatMap((nodeId) => {
|
|
const parsedNodeId = parseNodeId(nodeId)
|
|
return parsedNodeId ? [parsedNodeId] : []
|
|
})
|
|
}
|
|
}
|
|
return {
|
|
inputs: rawInputs
|
|
.map((input) => upgradeAndValidateInput(input, rootGraph))
|
|
.filter((entry): entry is LinearInput => entry !== null),
|
|
outputs: rawOutputs.flatMap((nodeId) => {
|
|
const parsedNodeId = parseNodeId(nodeId)
|
|
if (!parsedNodeId) return []
|
|
return ChangeTracker.isLoadingGraph || resolveNode(parsedNodeId)
|
|
? [parsedNodeId]
|
|
: []
|
|
})
|
|
}
|
|
}
|
|
|
|
function buildEntry(
|
|
widgetId: WidgetId,
|
|
name: string,
|
|
config: InputWidgetConfig | undefined
|
|
): LinearInput {
|
|
return config === undefined ? [widgetId, name] : [widgetId, name, config]
|
|
}
|
|
|
|
function upgradeAndValidateInput(
|
|
input: LinearInput,
|
|
rootGraph: NonNullable<typeof app.rootGraph>
|
|
): LinearInput | null {
|
|
const [storedId, widgetName, config] = input
|
|
|
|
if (typeof storedId === 'string' && isWidgetId(storedId)) {
|
|
const widget = findWidgetByEntityId(rootGraph, storedId)
|
|
if (widget) return buildEntry(storedId, widgetName, config)
|
|
const { nodeId } = parseWidgetId(storedId)
|
|
if (rootGraph.getNodeById?.(nodeId)) {
|
|
return buildEntry(storedId, widgetName, config)
|
|
}
|
|
return null
|
|
}
|
|
|
|
if (typeof storedId === 'string' && storedId.includes(':')) {
|
|
const [, widget] = resolveNodeWidget(storedId, widgetName)
|
|
if (!widget?.widgetId) return null
|
|
return buildEntry(widget.widgetId, widgetName, config)
|
|
}
|
|
|
|
const directNodeId = parseNodeId(storedId)
|
|
const directNode = directNodeId
|
|
? rootGraph.getNodeById?.(directNodeId)
|
|
: null
|
|
const directWidget = directNode?.widgets?.find((w) => w.name === widgetName)
|
|
if (directNode && directWidget) {
|
|
const derivedId = getWidgetIdForNode(directNode, directWidget)
|
|
if (derivedId) return buildEntry(derivedId, widgetName, config)
|
|
}
|
|
|
|
const matches: LinearInput[] = rootGraph.nodes.flatMap((node) => {
|
|
if (!(node instanceof SubgraphNode)) return []
|
|
return node.inputs.flatMap((inputSlot): LinearInput[] => {
|
|
if (!inputSlot.widgetId) return []
|
|
const target = resolveSubgraphInputTarget(node, inputSlot.name)
|
|
if (
|
|
target?.nodeId !== String(storedId) ||
|
|
target.widgetName !== widgetName
|
|
) {
|
|
return []
|
|
}
|
|
return [buildEntry(inputSlot.widgetId, inputSlot.name, config)]
|
|
})
|
|
})
|
|
if (matches.length === 1) return matches[0]
|
|
if (matches.length > 1) {
|
|
console.warn(
|
|
'[appModeStore] dropping ambiguous legacy selectedInput tuple',
|
|
{ storedId, widgetName }
|
|
)
|
|
return null
|
|
}
|
|
|
|
console.warn(
|
|
'[appModeStore] dropping legacy selectedInput tuple — no canonical identity available',
|
|
{ storedId, widgetName }
|
|
)
|
|
return null
|
|
}
|
|
|
|
function loadSelections(data: Partial<LinearData> | undefined) {
|
|
const { inputs, outputs } = pruneLinearData(data)
|
|
selectedInputs.value = inputs
|
|
selectedOutputs.value = outputs
|
|
}
|
|
|
|
function resetSelectedToWorkflow() {
|
|
const { activeWorkflow } = workflowStore
|
|
if (!activeWorkflow) return
|
|
|
|
const source =
|
|
activeWorkflow.changeTracker?.activeState?.extra?.linearData ??
|
|
activeWorkflow.initialState?.extra?.linearData
|
|
loadSelections(source)
|
|
}
|
|
|
|
useEventListener(
|
|
() => app.rootGraph?.events,
|
|
'configured',
|
|
resetSelectedToWorkflow
|
|
)
|
|
|
|
watch(
|
|
() =>
|
|
isBuilderMode.value
|
|
? { inputs: selectedInputs.value, outputs: selectedOutputs.value }
|
|
: null,
|
|
(data) => {
|
|
if (!data || ChangeTracker.isLoadingGraph) return
|
|
const graph = app.rootGraph
|
|
if (!graph) return
|
|
const extra = (graph.extra ??= {})
|
|
extra.linearData = {
|
|
inputs: [...data.inputs],
|
|
outputs: [...data.outputs]
|
|
}
|
|
workflowStore.activeWorkflow?.changeTracker?.captureCanvasState()
|
|
},
|
|
{ deep: true }
|
|
)
|
|
|
|
let unwatchReadOnly: (() => void) | undefined
|
|
function enforceReadOnly(inSelect: boolean) {
|
|
const { state } = getCanvas()
|
|
if (!state) return
|
|
state.readOnly = inSelect
|
|
unwatchReadOnly?.()
|
|
if (inSelect)
|
|
unwatchReadOnly = watch(
|
|
() => state.readOnly,
|
|
() => (state.readOnly = true)
|
|
)
|
|
}
|
|
|
|
function autoEnableVueNodes(inSelect: boolean) {
|
|
if (!inSelect) return
|
|
if (!settingStore.get('Comfy.VueNodes.Enabled')) {
|
|
void settingStore.set('Comfy.VueNodes.Enabled', true)
|
|
|
|
if (!settingStore.get('Comfy.AppBuilder.VueNodeSwitchDismissed')) {
|
|
showVueNodeSwitchPopup.value = true
|
|
}
|
|
}
|
|
}
|
|
|
|
watch(isSelectMode, (inSelect) => {
|
|
enforceReadOnly(inSelect)
|
|
autoEnableVueNodes(inSelect)
|
|
})
|
|
|
|
function enterBuilder() {
|
|
if (!hasNodes.value) {
|
|
emptyWorkflowDialog.show({
|
|
onEnterBuilder: () => enterBuilder(),
|
|
onDismiss: () => setMode('graph')
|
|
})
|
|
return
|
|
}
|
|
|
|
resetSelectedToWorkflow()
|
|
|
|
useSidebarTabStore().activeSidebarTabId = null
|
|
|
|
setMode(
|
|
mode.value === 'app' && hasOutputs.value
|
|
? 'builder:arrange'
|
|
: 'builder:inputs'
|
|
)
|
|
}
|
|
|
|
function exitBuilder() {
|
|
resetSelectedToWorkflow()
|
|
setMode('graph')
|
|
}
|
|
|
|
function removeSelectedInput(widget: IBaseWidget) {
|
|
const targetEntityId = widget.widgetId
|
|
if (!targetEntityId) return
|
|
const index = selectedInputs.value.findIndex(
|
|
([id]) => id === targetEntityId
|
|
)
|
|
if (index !== -1) selectedInputs.value.splice(index, 1)
|
|
}
|
|
|
|
function updateInputConfig(widget: IBaseWidget, config: InputWidgetConfig) {
|
|
const targetEntityId = widget.widgetId
|
|
if (!targetEntityId) return
|
|
const index = selectedInputs.value.findIndex(
|
|
([id]) => id === targetEntityId
|
|
)
|
|
if (index === -1) return
|
|
const [id, type, options] = selectedInputs.value[index]
|
|
selectedInputs.value.splice(index, 1, [id, type, { ...options, ...config }])
|
|
}
|
|
|
|
return {
|
|
enterBuilder,
|
|
exitBuilder,
|
|
hasNodes,
|
|
hasOutputs,
|
|
loadSelections,
|
|
pruneLinearData,
|
|
removeSelectedInput,
|
|
resetSelectedToWorkflow,
|
|
selectedInputs,
|
|
selectedOutputs,
|
|
updateInputConfig,
|
|
showVueNodeSwitchPopup
|
|
}
|
|
})
|