diff --git a/.fallow-baselines/dead-code.json b/.fallow-baselines/dead-code.json index 65b24e4bcf7..0aeaef93676 100644 --- a/.fallow-baselines/dead-code.json +++ b/.fallow-baselines/dead-code.json @@ -27,26 +27,6 @@ "src/composables/sidebarTabs/useJobHistorySidebarTab.ts->src/stores/workspace/sidebarTabStore.ts", "src/composables/usePaste.ts->src/scripts/app.ts", "src/extensions/core/load3d/Load3dUtils.ts->src/scripts/app.ts", - "src/lib/litegraph/src/ContextMenu.ts->src/lib/litegraph/src/litegraph.ts", - "src/lib/litegraph/src/ContextMenu.ts->src/lib/litegraph/src/LiteGraphGlobal.ts->src/lib/litegraph/src/litegraph.ts", - "src/lib/litegraph/src/DragAndScale.ts->src/lib/litegraph/src/litegraph.ts", - "src/lib/litegraph/src/DragAndScale.ts->src/lib/litegraph/src/LGraphCanvas.ts->src/lib/litegraph/src/litegraph.ts", - "src/lib/litegraph/src/DragAndScale.ts->src/lib/litegraph/src/LiteGraphGlobal.ts->src/lib/litegraph/src/litegraph.ts", - "src/lib/litegraph/src/LGraph.ts->src/lib/litegraph/src/litegraph.ts", - "src/lib/litegraph/src/LGraphCanvas.ts->src/lib/litegraph/src/LGraphGroup.ts", - "src/lib/litegraph/src/LGraphCanvas.ts->src/lib/litegraph/src/LGraphNode.ts", - "src/lib/litegraph/src/LGraphCanvas.ts->src/lib/litegraph/src/litegraph.ts", - "src/lib/litegraph/src/LGraphGroup.ts->src/lib/litegraph/src/litegraph.ts", - "src/lib/litegraph/src/LGraphNode.ts->src/lib/litegraph/src/litegraph.ts", - "src/lib/litegraph/src/LGraphNode.ts->src/lib/litegraph/src/utils/collections.ts", - "src/lib/litegraph/src/Reroute.ts->src/lib/litegraph/src/litegraph.ts", - "src/lib/litegraph/src/litegraph.ts->src/lib/litegraph/src/node/NodeInputSlot.ts", - "src/lib/litegraph/src/litegraph.ts->src/lib/litegraph/src/node/NodeOutputSlot.ts", - "src/lib/litegraph/src/litegraph.ts->src/lib/litegraph/src/subgraph/ExecutableNodeDTO.ts", - "src/lib/litegraph/src/litegraph.ts->src/lib/litegraph/src/subgraph/SubgraphNode.ts", - "src/lib/litegraph/src/litegraph.ts->src/lib/litegraph/src/subgraph/subgraphUtils.ts", - "src/lib/litegraph/src/litegraph.ts->src/lib/litegraph/src/widgets/LegacyWidget.ts", - "src/lib/litegraph/src/node/NodeInputSlot.ts->src/lib/litegraph/src/node/NodeSlot.ts", "src/platform/cloud/subscription/composables/useSubscriptionDialog.ts->src/services/dialogService.ts", "src/platform/missingMedia/missingMediaStore.ts->src/scripts/app.ts", "src/platform/missingModel/missingModelStore.ts->src/scripts/app.ts", diff --git a/src/lib/litegraph/src/ContextMenu.ts b/src/lib/litegraph/src/ContextMenu.ts index c2cb9f9e0f9..4f1425788bb 100644 --- a/src/lib/litegraph/src/ContextMenu.ts +++ b/src/lib/litegraph/src/ContextMenu.ts @@ -5,7 +5,7 @@ import type { IContextMenuOptions, IContextMenuValue } from './types/contextMenu' -import { LiteGraph } from './litegraph' +import { litegraph } from './litegraphInstance' const ALLOWED_TAGS = ['span', 'b', 'i', 'em', 'strong'] const ALLOWED_STYLE_PROPS = new Set([ @@ -215,7 +215,7 @@ export class ContextMenu { root.style.left = `${left}px` root.style.top = `${top}px` - if (LiteGraph.context_menu_scaling && options.scale) { + if (litegraph().context_menu_scaling && options.scale) { root.style.transform = `scale(${Math.round(options.scale * 4) * 0.25})` } } @@ -384,7 +384,7 @@ export class ContextMenu { } else if (!ContextMenu.isCursorOverElement(e, this.parentMenu.root)) { ContextMenu.trigger( this.parentMenu.root, - `${LiteGraph.pointerevents_method}leave`, + `${litegraph().pointerevents_method}leave`, e ) } diff --git a/src/lib/litegraph/src/DragAndScale.ts b/src/lib/litegraph/src/DragAndScale.ts index 695a2e70f0c..ec9cb8251f2 100644 --- a/src/lib/litegraph/src/DragAndScale.ts +++ b/src/lib/litegraph/src/DragAndScale.ts @@ -1,7 +1,8 @@ import { readBrowserDpr } from '@/renderer/core/canvas/canvasViewport' import type { Point, ReadOnlyRect, Rect } from './interfaces' -import { EaseFunction, Rectangle } from './litegraph' +import { EaseFunction } from './types/globalEnums' +import { Rectangle } from './infrastructure/Rectangle' export interface DragAndScaleState { /** diff --git a/src/lib/litegraph/src/LGraph.ts b/src/lib/litegraph/src/LGraph.ts index 27b708d1fc4..048c26a2fa7 100644 --- a/src/lib/litegraph/src/LGraph.ts +++ b/src/lib/litegraph/src/LGraph.ts @@ -108,7 +108,8 @@ import { } from './utils/namedValuesShadowDiffTelemetry' import type { DragAndScaleState } from './DragAndScale' -import { LGraphCanvas } from './LGraphCanvas' +import type { LGraphCanvas } from './LGraphCanvas' +import { canvasClass } from './canvas/canvasClassAccess' import { Rectangle } from './infrastructure/Rectangle' import { LGraphGroup } from './LGraphGroup' import { LGraphNode } from './LGraphNode' @@ -145,7 +146,8 @@ import type { } from './interfaces' import type { INodeInputSlot, INodeOutputSlot } from './types/slots' import type { LinkNetwork } from './types/linkNetwork' -import { LiteGraph, SubgraphNode } from './litegraph' +import { LiteGraph } from './litegraphInstance' +import { SubgraphNode } from './subgraph/SubgraphNode' import { alignOutsideContainer, alignToContainer, @@ -157,6 +159,7 @@ import { SubgraphInput } from './subgraph/SubgraphInput' import { SubgraphInputNode } from './subgraph/SubgraphInputNode' import { SubgraphOutput } from './subgraph/SubgraphOutput' import { SubgraphOutputNode } from './subgraph/SubgraphOutputNode' +import { provideSubgraphGuard } from './subgraph/subgraphTypeGuards' import { captureUnpackedTargetInput, findUnavailableSubgraphNodeType, @@ -940,7 +943,7 @@ export class LGraph * Attach Canvas to this graph */ attachCanvas(canvas: LGraphCanvas): void { - if (!(canvas instanceof LGraphCanvas)) { + if (!(canvas instanceof canvasClass)) { throw new TypeError('attachCanvas expects an LGraphCanvas instance') } @@ -3806,3 +3809,5 @@ export class Subgraph } } } + +provideSubgraphGuard((value): value is Subgraph => value instanceof Subgraph) diff --git a/src/lib/litegraph/src/LGraphCanvas.ts b/src/lib/litegraph/src/LGraphCanvas.ts index 6a67a9c412a..f771308d75e 100644 --- a/src/lib/litegraph/src/LGraphCanvas.ts +++ b/src/lib/litegraph/src/LGraphCanvas.ts @@ -1,6 +1,7 @@ import { default as DOMPurify } from 'dompurify' import { cloneDeep, toString } from 'es-toolkit/compat' import { toValue } from 'vue' +import { provideCanvasClass } from './canvas/canvasClassAccess' import { isMiddleButtonEvent } from '@/base/pointerUtils' import { transferLinkPresentation } from '@/core/graph/transferLinkPresentation' @@ -144,7 +145,7 @@ import type { PanelWidgetCallback, PanelWidgetOptions } from './types/panel' -import { LiteGraph } from './litegraph' +import { LiteGraph } from './litegraphInstance' import { containsRect, createBounds, @@ -9111,3 +9112,5 @@ defineDeprecatedProperty( 'applyNodePositions', 'LGraphCanvas.repositionNodesVueMode is deprecated. Use applyNodePositions instead.' ) + +provideCanvasClass(LGraphCanvas) diff --git a/src/lib/litegraph/src/LGraphGroup.ts b/src/lib/litegraph/src/LGraphGroup.ts index 680dbcc6c11..973fd95d967 100644 --- a/src/lib/litegraph/src/LGraphGroup.ts +++ b/src/lib/litegraph/src/LGraphGroup.ts @@ -10,7 +10,8 @@ import { toGroupId } from '@/types/groupId' import { hexToRgb, luminance, readableTextColor } from '@/utils/colorUtil' import type { LGraph } from './LGraph' -import { LGraphCanvas } from './LGraphCanvas' +import type { LGraphCanvas } from './LGraphCanvas' +import { canvasClass } from './canvas/canvasClassAccess' import { LGraphNode } from './LGraphNode' import { strokeShape } from './draw' import { createMutationView } from './infrastructure/createMutationView' @@ -24,7 +25,8 @@ import type { Size } from './interfaces' import type { IContextMenuValue } from './types/contextMenu' -import { LiteGraph, Rectangle } from './litegraph' +import { LiteGraph } from './litegraphInstance' +import { Rectangle } from './infrastructure/Rectangle' import { containsCentre, containsRect, @@ -123,7 +125,7 @@ export class LGraphGroup implements Positionable, IPinnable, IColorable { // TODO: Object instantiation pattern requires too much boilerplate and null checking. ID should be passed in via constructor. this.id = toGroupId(id ?? -1) this.title = title || 'Group' - const { pale_blue } = LGraphCanvas.node_colors + const { pale_blue } = canvasClass.node_colors this.color = pale_blue.groupcolor } @@ -139,7 +141,7 @@ export class LGraphGroup implements Positionable, IPinnable, IColorable { /** @inheritdoc {@link IColorable.getColorOption} */ getColorOption(): ColorOption | null { return ( - Object.values(LGraphCanvas.node_colors).find( + Object.values(canvasClass.node_colors).find( (colorOption) => colorOption.groupcolor === this.color ) ?? null ) @@ -459,19 +461,19 @@ export class LGraphGroup implements Positionable, IPinnable, IColorable { } }, null, - { content: 'Title', callback: LGraphCanvas.onShowPropertyEditor }, + { content: 'Title', callback: canvasClass.onShowPropertyEditor }, { content: 'Color', has_submenu: true, - callback: LGraphCanvas.onMenuNodeColors + callback: canvasClass.onMenuNodeColors }, { content: 'Font size', property: 'font_size', - callback: LGraphCanvas.onShowPropertyEditor + callback: canvasClass.onShowPropertyEditor }, null, - { content: 'Remove', callback: LGraphCanvas.onMenuNodeRemove } + { content: 'Remove', callback: canvasClass.onMenuNodeRemove } ] } diff --git a/src/lib/litegraph/src/LGraphNode.ts b/src/lib/litegraph/src/LGraphNode.ts index 04a6099f663..d9c13f719c4 100644 --- a/src/lib/litegraph/src/LGraphNode.ts +++ b/src/lib/litegraph/src/LGraphNode.ts @@ -51,12 +51,13 @@ import { } from '@/lib/litegraph/src/constants' import { cachedMeasureText } from '@/lib/litegraph/src/utils/textMeasureCache' import type { DragAndScale } from './DragAndScale' -import type { LGraph } from './LGraph' +import type { LGraph, Subgraph } from './LGraph' import { LGraphBadge } from './LGraphBadge' import { badgeDrawObjects, badgeRows } from './nodeBadgeDraw' import { LGraphButton } from './LGraphButton' import type { LGraphButtonOptions } from './LGraphButton' -import { LGraphCanvas } from './LGraphCanvas' +import type { LGraphCanvas } from './LGraphCanvas' +import { canvasClass } from './canvas/canvasClassAccess' import { realignGroupWidgetChildLinks } from './linkDeduplication' import { LLink, replaceLinkTopology, slotFloatingLinks } from './LLink' import { @@ -120,7 +121,8 @@ import type { INodeSlotContextItem } from './types/slots' import type { Panel } from './types/panel' -import { LiteGraph, Subgraph } from './litegraph' +import { LiteGraph } from './litegraphInstance' +import { isSubgraph } from './subgraph/subgraphTypeGuards' import type { LGraphNodeConstructor, SubgraphNode } from './litegraph' import { createBounds, @@ -153,7 +155,7 @@ import type { TWidgetType, TWidgetValue } from './types/widgets' -import { findFreeSlotOfType } from './utils/collections' +import { findFreeSlotOfType, provideGraphNodeGuard } from './utils/collections' import { warnDeprecated } from './utils/feedback' import { computeLegacyWidgetShadow, @@ -659,7 +661,7 @@ export class LGraphNode /** @inheritdoc {@link IColorable.getColorOption} */ getColorOption(): ColorOption | null { return ( - Object.values(LGraphCanvas.node_colors).find( + Object.values(canvasClass.node_colors).find( (colorOption) => colorOption.color === this.color && colorOption.bgcolor === this.bgcolor @@ -2169,7 +2171,7 @@ export class LGraphNode function compute_text_size(text: string | undefined, fontStyle: string) { const value = text ?? '' return ( - LGraphCanvas._measureText?.(value, fontStyle) ?? + canvasClass._measureText?.(value, fontStyle) ?? font_size * value.length * 0.6 ) } @@ -3440,10 +3442,7 @@ export class LGraphNode } disconnected = true - if ( - link_info.target_id === SUBGRAPH_OUTPUT_ID && - graph instanceof Subgraph - ) { + if (link_info.target_id === SUBGRAPH_OUTPUT_ID && isSubgraph(graph)) { const targetSlot = legacyArrayItem( graph.outputNode.slots, link_info.target_slot @@ -4619,3 +4618,5 @@ export class LGraphNode ctx.fillStyle = originalFillStyle } } + +provideGraphNodeGuard((item): item is LGraphNode => item instanceof LGraphNode) diff --git a/src/lib/litegraph/src/Reroute.ts b/src/lib/litegraph/src/Reroute.ts index 840aebf9daa..84d4705458b 100644 --- a/src/lib/litegraph/src/Reroute.ts +++ b/src/lib/litegraph/src/Reroute.ts @@ -43,7 +43,7 @@ import type { } from './interfaces' import type { INodeInputSlot, INodeOutputSlot } from './types/slots' import type { LinkNetwork, ReadonlyLinkNetwork } from './types/linkNetwork' -import { LiteGraph } from './litegraph' +import { litegraph } from './litegraphInstance' import { distance, isPointInRect } from './measure' import type { Serialisable, SerialisableReroute } from './types/serialisation' @@ -472,7 +472,7 @@ export class Reroute snapToGrid(snapTo: number): boolean { if (!snapTo) return false - const offsetY = LiteGraph.NODE_SLOT_HEIGHT * 0.7 + const offsetY = litegraph().NODE_SLOT_HEIGHT * 0.7 const { x, y } = this.storedPosition const snappedX = snapTo * Math.round(x / snapTo) const snappedY = snapTo * Math.round((y - offsetY) / snapTo) + offsetY diff --git a/src/lib/litegraph/src/canvas/canvasClassAccess.ts b/src/lib/litegraph/src/canvas/canvasClassAccess.ts new file mode 100644 index 00000000000..8bc5fe4a738 --- /dev/null +++ b/src/lib/litegraph/src/canvas/canvasClassAccess.ts @@ -0,0 +1,34 @@ +import type { ContextMenu } from '../ContextMenu' +import type { LGraphNode } from '../LGraphNode' +import type { ColorOption } from '../interfaces' +import type { + IContextMenuOptions, + IContextMenuValue +} from '../types/contextMenu' + +interface CanvasClassAccess { + [Symbol.hasInstance](value: unknown): boolean + node_colors: Record + _measureText?: (text: string, fontStyle?: string) => number + onShowPropertyEditor( + item: { property?: 'title' | 'font_size' }, + options: IContextMenuOptions, + event: MouseEvent, + menu: ContextMenu, + node: { title: string; font_size?: number } + ): void + onMenuNodeColors( + value: IContextMenuValue, + options: IContextMenuOptions, + event: MouseEvent, + menu: ContextMenu, + node: LGraphNode + ): boolean + onMenuNodeRemove(): void +} + +export let canvasClass: CanvasClassAccess + +export function provideCanvasClass(value: CanvasClassAccess): void { + canvasClass = value +} diff --git a/src/lib/litegraph/src/canvas/linkGeometry.ts b/src/lib/litegraph/src/canvas/linkGeometry.ts index 11bea2b37a5..54c27964a6c 100644 --- a/src/lib/litegraph/src/canvas/linkGeometry.ts +++ b/src/lib/litegraph/src/canvas/linkGeometry.ts @@ -1,7 +1,7 @@ import type { LGraph } from '../LGraph' import type { LLink } from '../LLink' import type { Point } from '../interfaces' -import { LiteGraph } from '../litegraph' +import { litegraph } from '../litegraphInstance' import { inputLinkId } from '../node/slotLinks' import { getSlotPosition } from '@/renderer/core/canvas/litegraph/slotCalculations' @@ -16,7 +16,7 @@ export function getLinkEndpointPositions( return } - const endPos = LiteGraph.vueNodesMode + const endPos = litegraph().vueNodesMode ? getSlotPosition(inputNode, link.target_slot, true) : inputNode.getInputPos(link.target_slot) return [subgraphInput.pos, endPos] @@ -28,7 +28,7 @@ export function getLinkEndpointPositions( return } - const startPos = LiteGraph.vueNodesMode + const startPos = litegraph().vueNodesMode ? getSlotPosition(outputNode, link.origin_slot, false) : outputNode.getOutputPos(link.origin_slot) return [startPos, subgraphOutput.pos] @@ -42,10 +42,10 @@ export function getLinkEndpointPositions( return if (!outputNode || !output) return - const endPos: Point = LiteGraph.vueNodesMode + const endPos: Point = litegraph().vueNodesMode ? getSlotPosition(inputNode, link.target_slot, true) : inputNode.getInputPos(link.target_slot) - const startPos: Point = LiteGraph.vueNodesMode + const startPos: Point = litegraph().vueNodesMode ? getSlotPosition(outputNode, link.origin_slot, false) : outputNode.getOutputPos(link.origin_slot) diff --git a/src/lib/litegraph/src/litegraphInstance.ts b/src/lib/litegraph/src/litegraphInstance.ts index 11f3cbc2143..88d74fb86a4 100644 --- a/src/lib/litegraph/src/litegraphInstance.ts +++ b/src/lib/litegraph/src/litegraphInstance.ts @@ -17,9 +17,11 @@ declare global { * The barrel constructs the singleton and calls {@link registerLiteGraphInstance}. */ let instance: LiteGraphGlobal | null = null +export let LiteGraph: LiteGraphGlobal export function registerLiteGraphInstance(value: LiteGraphGlobal): void { instance = value + LiteGraph = value globalThis.__COMFY_LITEGRAPH_INSTANCE__ = value } diff --git a/src/lib/litegraph/src/node/NodeInputSlot.ts b/src/lib/litegraph/src/node/NodeInputSlot.ts index af0e58c3c05..d45cf99e2b2 100644 --- a/src/lib/litegraph/src/node/NodeInputSlot.ts +++ b/src/lib/litegraph/src/node/NodeInputSlot.ts @@ -6,14 +6,17 @@ import type { INodeInputSlot, INodeOutputSlot } from '@/lib/litegraph/src/types/slots' -import { LiteGraph } from '@/lib/litegraph/src/litegraph' -import { NodeSlot } from '@/lib/litegraph/src/node/NodeSlot' +import { LiteGraph } from '@/lib/litegraph/src/litegraphInstance' +import { + NodeSlot, + provideNodeInputSlotGuard +} from '@/lib/litegraph/src/node/NodeSlot' import { inputHasLink, inputLink } from '@/lib/litegraph/src/node/slotLinks' import { warnDeprecated } from '@/lib/litegraph/src/utils/feedback' import type { IDrawOptions } from '@/lib/litegraph/src/node/NodeSlot' import type { SubgraphInput } from '@/lib/litegraph/src/subgraph/SubgraphInput' import type { SubgraphOutput } from '@/lib/litegraph/src/subgraph/SubgraphOutput' -import { isSubgraphInput } from '@/lib/litegraph/src/subgraph/subgraphUtils' +import { isSubgraphInput } from '@/lib/litegraph/src/subgraph/subgraphTypeGuards' import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets' export class NodeInputSlot extends NodeSlot implements INodeInputSlot { @@ -130,3 +133,5 @@ function linkOf(slot: NodeInputSlot): LLink | undefined { const { graph } = slot.node return graph ? inputLink(graph, slot.node.id, indexOf(slot)) : undefined } + +provideNodeInputSlotGuard((slot) => slot instanceof NodeInputSlot) diff --git a/src/lib/litegraph/src/node/NodeOutputSlot.ts b/src/lib/litegraph/src/node/NodeOutputSlot.ts index 23dfdb4a608..b0601bb3e4b 100644 --- a/src/lib/litegraph/src/node/NodeOutputSlot.ts +++ b/src/lib/litegraph/src/node/NodeOutputSlot.ts @@ -6,14 +6,14 @@ import type { INodeInputSlot, INodeOutputSlot } from '@/lib/litegraph/src/types/slots' -import { LiteGraph } from '@/lib/litegraph/src/litegraph' +import { LiteGraph } from '@/lib/litegraph/src/litegraphInstance' import { createArrayMutationView } from '@/lib/litegraph/src/infrastructure/createMutationView' import { NodeSlot } from '@/lib/litegraph/src/node/NodeSlot' import type { IDrawOptions } from '@/lib/litegraph/src/node/NodeSlot' import { outputHasLinks, outputLinks } from '@/lib/litegraph/src/node/slotLinks' import type { SubgraphInput } from '@/lib/litegraph/src/subgraph/SubgraphInput' import type { SubgraphOutput } from '@/lib/litegraph/src/subgraph/SubgraphOutput' -import { isSubgraphOutput } from '@/lib/litegraph/src/subgraph/subgraphUtils' +import { isSubgraphOutput } from '@/lib/litegraph/src/subgraph/subgraphTypeGuards' import { warnDeprecated } from '@/lib/litegraph/src/utils/feedback' export class NodeOutputSlot extends NodeSlot implements INodeOutputSlot { diff --git a/src/lib/litegraph/src/node/NodeSlot.ts b/src/lib/litegraph/src/node/NodeSlot.ts index 1400099ef01..2cb0ef39ee7 100644 --- a/src/lib/litegraph/src/node/NodeSlot.ts +++ b/src/lib/litegraph/src/node/NodeSlot.ts @@ -15,7 +15,8 @@ import type { INodeOutputSlot, ISubgraphInput } from '@/lib/litegraph/src/types/slots' -import { LiteGraph, Rectangle } from '@/lib/litegraph/src/litegraph' +import { LiteGraph } from '@/lib/litegraph/src/litegraphInstance' +import { Rectangle } from '@/lib/litegraph/src/infrastructure/Rectangle' import { getCentre } from '@/lib/litegraph/src/measure' import type { SubgraphInput } from '@/lib/litegraph/src/subgraph/SubgraphInput' import type { SubgraphOutput } from '@/lib/litegraph/src/subgraph/SubgraphOutput' @@ -24,9 +25,16 @@ import { RenderShape } from '@/lib/litegraph/src/types/globalEnums' -import { NodeInputSlot } from './NodeInputSlot' import { SlotBase } from './SlotBase' +let isNodeInputSlot: (slot: NodeSlot) => boolean + +export function provideNodeInputSlotGuard( + guard: (slot: NodeSlot) => boolean +): void { + isNodeInputSlot = guard +} + export interface IDrawOptions { colorContext: DefaultConnectionColors labelPosition?: LabelPosition @@ -292,7 +300,7 @@ export abstract class NodeSlot extends SlotBase implements INodeSlot { ctx.rect(x - 7 + 0.5, y - 4, 14, 8) } else if (this.shape === RenderShape.ARROW) { // Adjust arrow direction based on whether this is an input or output slot - const isInput = this instanceof NodeInputSlot + const isInput = isNodeInputSlot(this) if (isInput) { ctx.moveTo(x + 8, y) ctx.lineTo(x - 4, y - 4) diff --git a/src/lib/litegraph/src/subgraph/ExecutableNodeDTO.ts b/src/lib/litegraph/src/subgraph/ExecutableNodeDTO.ts index 11f41ca578e..8e54346a7b6 100644 --- a/src/lib/litegraph/src/subgraph/ExecutableNodeDTO.ts +++ b/src/lib/litegraph/src/subgraph/ExecutableNodeDTO.ts @@ -9,7 +9,8 @@ import { NullGraphError } from '@/lib/litegraph/src/infrastructure/NullGraphErro import { RecursionError } from '@/lib/litegraph/src/infrastructure/RecursionError' import { SlotIndexError } from '@/lib/litegraph/src/infrastructure/SlotIndexError' import type { ISlotType } from '@/lib/litegraph/src/interfaces' -import { LGraphEventMode, LiteGraph } from '@/lib/litegraph/src/litegraph' +import { LGraphEventMode } from '@/lib/litegraph/src/types/globalEnums' +import { litegraph } from '@/lib/litegraph/src/litegraphInstance' import type { Subgraph } from './Subgraph' import type { SubgraphNode } from './SubgraphNode' @@ -366,8 +367,8 @@ export class ExecutableNodeDTO implements ExecutableLGraphNode { // Prefer input with the same slot ID if ( oppositeInput && - LiteGraph.isValidConnection(oppositeInput.type, outputType) && - LiteGraph.isValidConnection(oppositeInput.type, type) + litegraph().isValidConnection(oppositeInput.type, outputType) && + litegraph().isValidConnection(oppositeInput.type, type) ) { return slot } @@ -379,8 +380,8 @@ export class ExecutableNodeDTO implements ExecutableLGraphNode { // Find first matching slot - prefer exact type return inputs.findIndex( (input) => - LiteGraph.isValidConnection(input.type, outputType) && - LiteGraph.isValidConnection(input.type, type) + litegraph().isValidConnection(input.type, outputType) && + litegraph().isValidConnection(input.type, type) ) } diff --git a/src/lib/litegraph/src/subgraph/SubgraphIONodeBase.ts b/src/lib/litegraph/src/subgraph/SubgraphIONodeBase.ts index 95eb6ff2851..1d4ef724338 100644 --- a/src/lib/litegraph/src/subgraph/SubgraphIONodeBase.ts +++ b/src/lib/litegraph/src/subgraph/SubgraphIONodeBase.ts @@ -15,7 +15,7 @@ import type { INodeInputSlot, INodeOutputSlot } from '@/lib/litegraph/src/types/slots' -import { LiteGraph } from '@/lib/litegraph/src/litegraph' +import { LiteGraph } from '@/lib/litegraph/src/litegraphInstance' import type { CanvasColour, CanvasPointer, diff --git a/src/lib/litegraph/src/subgraph/SubgraphInput.ts b/src/lib/litegraph/src/subgraph/SubgraphInput.ts index 2b8974aae09..3c727f95f51 100644 --- a/src/lib/litegraph/src/subgraph/SubgraphInput.ts +++ b/src/lib/litegraph/src/subgraph/SubgraphInput.ts @@ -11,14 +11,14 @@ import type { INodeInputSlot, INodeOutputSlot } from '@/lib/litegraph/src/types/slots' -import { LiteGraph } from '@/lib/litegraph/src/litegraph' +import { LiteGraph } from '@/lib/litegraph/src/litegraphInstance' import { NodeSlotType } from '@/lib/litegraph/src/types/globalEnums' import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets' import type { SubgraphInputNode } from './SubgraphInputNode' import type { SubgraphOutput } from './SubgraphOutput' import { SubgraphSlot } from './SubgraphSlotBase' -import { isNodeSlot, isSubgraphOutput } from './subgraphUtils' +import { isNodeSlot, isSubgraphOutput } from './subgraphTypeGuards' /** * An input "slot" from a parent graph into a subgraph. diff --git a/src/lib/litegraph/src/subgraph/SubgraphInputNode.ts b/src/lib/litegraph/src/subgraph/SubgraphInputNode.ts index 61fd158fc65..103a2d1b58e 100644 --- a/src/lib/litegraph/src/subgraph/SubgraphInputNode.ts +++ b/src/lib/litegraph/src/subgraph/SubgraphInputNode.ts @@ -25,6 +25,7 @@ import { EmptySubgraphInput } from './EmptySubgraphInput' import { SubgraphIONodeBase } from './SubgraphIONodeBase' import type { SubgraphInput } from './SubgraphInput' import type { SubgraphOutput } from './SubgraphOutput' +import { provideSubgraphInputGuard } from './subgraphTypeGuards' export class SubgraphInputNode extends SubgraphIONodeBase @@ -288,3 +289,14 @@ export class SubgraphInputNode this.drawSlots(ctx, colorContext, fromSlot, editorAlpha) } } + +function isSubgraphInput(slot: unknown): slot is SubgraphInput { + return ( + slot != null && + typeof slot === 'object' && + 'parent' in slot && + slot.parent instanceof SubgraphInputNode + ) +} + +provideSubgraphInputGuard(isSubgraphInput) diff --git a/src/lib/litegraph/src/subgraph/SubgraphNode.ts b/src/lib/litegraph/src/subgraph/SubgraphNode.ts index 37ee451cf6c..e3913f7eb3b 100644 --- a/src/lib/litegraph/src/subgraph/SubgraphNode.ts +++ b/src/lib/litegraph/src/subgraph/SubgraphNode.ts @@ -10,7 +10,7 @@ import { NullGraphError } from '@/lib/litegraph/src/infrastructure/NullGraphErro import { RecursionError } from '@/lib/litegraph/src/infrastructure/RecursionError' import type { IWidgetLocator } from '@/lib/litegraph/src/interfaces' import type { ISubgraphInput } from '@/lib/litegraph/src/types/slots' -import { LiteGraph } from '@/lib/litegraph/src/litegraph' +import { LiteGraph } from '@/lib/litegraph/src/litegraphInstance' import type { INodeInputSlot, ISlotType } from '@/lib/litegraph/src/litegraph' import { NodeInputSlot } from '@/lib/litegraph/src/node/NodeInputSlot' import { NodeOutputSlot } from '@/lib/litegraph/src/node/NodeOutputSlot' diff --git a/src/lib/litegraph/src/subgraph/SubgraphOutput.ts b/src/lib/litegraph/src/subgraph/SubgraphOutput.ts index d0691b0ab87..be544328f7c 100644 --- a/src/lib/litegraph/src/subgraph/SubgraphOutput.ts +++ b/src/lib/litegraph/src/subgraph/SubgraphOutput.ts @@ -8,13 +8,13 @@ import type { INodeInputSlot, INodeOutputSlot } from '@/lib/litegraph/src/types/slots' -import { LiteGraph } from '@/lib/litegraph/src/litegraph' +import { LiteGraph } from '@/lib/litegraph/src/litegraphInstance' import { NodeSlotType } from '@/lib/litegraph/src/types/globalEnums' import type { SubgraphInput } from './SubgraphInput' import type { SubgraphOutputNode } from './SubgraphOutputNode' import { SubgraphSlot } from './SubgraphSlotBase' -import { isNodeSlot, isSubgraphInput } from './subgraphUtils' +import { isNodeSlot, isSubgraphInput } from './subgraphTypeGuards' /** * An output "slot" from a subgraph to a parent graph. diff --git a/src/lib/litegraph/src/subgraph/SubgraphOutputNode.ts b/src/lib/litegraph/src/subgraph/SubgraphOutputNode.ts index 0ef1c4f7bd0..4f935326747 100644 --- a/src/lib/litegraph/src/subgraph/SubgraphOutputNode.ts +++ b/src/lib/litegraph/src/subgraph/SubgraphOutputNode.ts @@ -23,6 +23,7 @@ import { EmptySubgraphOutput } from './EmptySubgraphOutput' import { SubgraphIONodeBase } from './SubgraphIONodeBase' import type { SubgraphInput } from './SubgraphInput' import type { SubgraphOutput } from './SubgraphOutput' +import { provideSubgraphOutputGuard } from './subgraphTypeGuards' export class SubgraphOutputNode extends SubgraphIONodeBase @@ -161,3 +162,14 @@ export class SubgraphOutputNode this.drawSlots(ctx, colorContext, fromSlot, editorAlpha) } } + +function isSubgraphOutput(slot: unknown): slot is SubgraphOutput { + return ( + slot != null && + typeof slot === 'object' && + 'parent' in slot && + slot.parent instanceof SubgraphOutputNode + ) +} + +provideSubgraphOutputGuard(isSubgraphOutput) diff --git a/src/lib/litegraph/src/subgraph/SubgraphSlotBase.ts b/src/lib/litegraph/src/subgraph/SubgraphSlotBase.ts index d79aa964562..6e09b961ebc 100644 --- a/src/lib/litegraph/src/subgraph/SubgraphSlotBase.ts +++ b/src/lib/litegraph/src/subgraph/SubgraphSlotBase.ts @@ -1,4 +1,4 @@ -import { LGraphCanvas } from '@/lib/litegraph/src/LGraphCanvas' +import { canvasClass } from '@/lib/litegraph/src/canvas/canvasClassAccess' import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode' import type { LLink, LinkId } from '@/lib/litegraph/src/LLink' import type { RerouteId } from '@/lib/litegraph/src/Reroute' @@ -15,7 +15,7 @@ import type { INodeInputSlot, INodeOutputSlot } from '@/lib/litegraph/src/types/slots' -import { LiteGraph } from '@/lib/litegraph/src/litegraph' +import { LiteGraph } from '@/lib/litegraph/src/litegraphInstance' import { SlotBase } from '@/lib/litegraph/src/node/SlotBase' import type { CanvasPointerEvent, @@ -136,7 +136,7 @@ export abstract class SubgraphSlot } measure(): Readonly { - const width = LGraphCanvas._measureText?.(this.displayName) ?? 0 + const width = canvasClass._measureText?.(this.displayName) ?? 0 const { defaultHeight } = SubgraphSlot this.measurement.setValues(width + defaultHeight, defaultHeight) diff --git a/src/lib/litegraph/src/subgraph/subgraphTypeGuards.ts b/src/lib/litegraph/src/subgraph/subgraphTypeGuards.ts new file mode 100644 index 00000000000..4cdb6f242ee --- /dev/null +++ b/src/lib/litegraph/src/subgraph/subgraphTypeGuards.ts @@ -0,0 +1,32 @@ +import type { Subgraph } from '../LGraph' +import type { INodeInputSlot, INodeOutputSlot } from '../types/slots' +import type { SubgraphInput } from './SubgraphInput' +import type { SubgraphOutput } from './SubgraphOutput' + +export let isSubgraph: (value: unknown) => value is Subgraph +export let isSubgraphInput: (slot: unknown) => slot is SubgraphInput +export let isSubgraphOutput: (slot: unknown) => slot is SubgraphOutput + +export function provideSubgraphGuard(guard: typeof isSubgraph): void { + isSubgraph = guard +} + +export function provideSubgraphInputGuard(guard: typeof isSubgraphInput): void { + isSubgraphInput = guard +} + +export function provideSubgraphOutputGuard( + guard: typeof isSubgraphOutput +): void { + isSubgraphOutput = guard +} + +export function isNodeSlot( + slot: unknown +): slot is INodeInputSlot | INodeOutputSlot { + return ( + slot != null && + typeof slot === 'object' && + ('link' in slot || 'links' in slot) + ) +} diff --git a/src/lib/litegraph/src/subgraph/subgraphUtils.ts b/src/lib/litegraph/src/subgraph/subgraphUtils.ts index e405ca6ebf6..84c2c7f5088 100644 --- a/src/lib/litegraph/src/subgraph/subgraphUtils.ts +++ b/src/lib/litegraph/src/subgraph/subgraphUtils.ts @@ -18,11 +18,9 @@ import { SUBGRAPH_OUTPUT_ID } from '@/lib/litegraph/src/constants' import type { Positionable } from '@/lib/litegraph/src/interfaces' -import type { - INodeInputSlot, - INodeOutputSlot -} from '@/lib/litegraph/src/types/slots' -import { LiteGraph, createUuidv4 } from '@/lib/litegraph/src/litegraph' +import type { INodeOutputSlot } from '@/lib/litegraph/src/types/slots' +import { LiteGraph } from '@/lib/litegraph/src/litegraphInstance' +import { createUuidv4 } from '@/utils/uuid' import { nextUniqueName } from '@/lib/litegraph/src/strings' import { UNASSIGNED_NODE_ID } from '@/types/nodeId' import type { @@ -35,7 +33,6 @@ import type { GraphOrSubgraph, Subgraph } from './Subgraph' import type { SubgraphInput } from './SubgraphInput' import { SubgraphInputNode } from './SubgraphInputNode' import type { SubgraphNode } from './SubgraphNode' -import type { SubgraphOutput } from './SubgraphOutput' import { SubgraphOutputNode } from './SubgraphOutputNode' interface FilteredItems { @@ -652,45 +649,4 @@ export function reorderSubgraphInputs( } } -/** - * Type guard to check if a slot is a SubgraphInput. - * @param slot The slot to check - * @returns true if the slot is a SubgraphInput - */ -export function isSubgraphInput(slot: unknown): slot is SubgraphInput { - return ( - slot != null && - typeof slot === 'object' && - 'parent' in slot && - slot.parent instanceof SubgraphInputNode - ) -} - -/** - * Type guard to check if a slot is a SubgraphOutput. - * @param slot The slot to check - * @returns true if the slot is a SubgraphOutput - */ -export function isSubgraphOutput(slot: unknown): slot is SubgraphOutput { - return ( - slot != null && - typeof slot === 'object' && - 'parent' in slot && - slot.parent instanceof SubgraphOutputNode - ) -} - -/** - * Type guard to check if a slot is a regular node slot (INodeInputSlot or INodeOutputSlot). - * @param slot The slot to check - * @returns true if the slot is a regular node slot - */ -export function isNodeSlot( - slot: unknown -): slot is INodeInputSlot | INodeOutputSlot { - return ( - slot != null && - typeof slot === 'object' && - ('link' in slot || 'links' in slot) - ) -} +export { isSubgraphInput, isSubgraphOutput } from './subgraphTypeGuards' diff --git a/src/lib/litegraph/src/subgraph/unpackSubgraph.ts b/src/lib/litegraph/src/subgraph/unpackSubgraph.ts index 535e41469e5..df3f0a35713 100644 --- a/src/lib/litegraph/src/subgraph/unpackSubgraph.ts +++ b/src/lib/litegraph/src/subgraph/unpackSubgraph.ts @@ -7,7 +7,7 @@ import type { Point } from '../interfaces' import type { INodeInputSlot } from '../types/slots' import type { LGraph } from '../LGraph' import { LGraphNode } from '../LGraphNode' -import { LiteGraph } from '../litegraph' +import { LiteGraph } from '../litegraphInstance' import type { ISerialisedNode } from '../types/serialisation' export type UnpackedTargetInput = diff --git a/src/lib/litegraph/src/utils/collections.ts b/src/lib/litegraph/src/utils/collections.ts index 4f443ccb2aa..77844a706e1 100644 --- a/src/lib/litegraph/src/utils/collections.ts +++ b/src/lib/litegraph/src/utils/collections.ts @@ -1,8 +1,14 @@ -import { LGraphNode } from '@/lib/litegraph/src/LGraphNode' +import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode' import { parseSlotTypes } from '@/lib/litegraph/src/strings' import type { ISlotType, Positionable } from '../interfaces' +let isGraphNode: (item: Positionable) => item is LGraphNode + +export function provideGraphNodeGuard(guard: typeof isGraphNode): void { + isGraphNode = guard +} + /** * Creates a flat set of all positionable items by recursively iterating through all child items. * @@ -57,7 +63,7 @@ export function findFirstNode( items: Iterable ): LGraphNode | undefined { for (const item of items) { - if (item instanceof LGraphNode) return item + if (isGraphNode(item)) return item } } diff --git a/src/lib/litegraph/src/utils/feedback.ts b/src/lib/litegraph/src/utils/feedback.ts index 8215735a439..88e798a903c 100644 --- a/src/lib/litegraph/src/utils/feedback.ts +++ b/src/lib/litegraph/src/utils/feedback.ts @@ -1,4 +1,4 @@ -import { LiteGraph } from '@/lib/litegraph/src/litegraph' +import { litegraph } from '@/lib/litegraph/src/litegraphInstance' /** Guard against unbound allocation. */ const UNIQUE_MESSAGE_LIMIT = 10_000 @@ -11,7 +11,7 @@ const sentWarnings: Set = new Set() * @param source A reference object to include alongside the message, e.g. `this`. */ export function warnDeprecated(message: string, source?: object): void { - if (!LiteGraph.alwaysRepeatWarnings) { + if (!litegraph().alwaysRepeatWarnings) { // Do not repeat if (sentWarnings.has(message)) return @@ -21,7 +21,7 @@ export function warnDeprecated(message: string, source?: object): void { sentWarnings.add(message) } - for (const callback of LiteGraph.onDeprecationWarning) { + for (const callback of litegraph().onDeprecationWarning) { callback(message, source) } } diff --git a/src/lib/litegraph/src/utils/linkColors.ts b/src/lib/litegraph/src/utils/linkColors.ts index e6e966133d6..b2f745d5753 100644 --- a/src/lib/litegraph/src/utils/linkColors.ts +++ b/src/lib/litegraph/src/utils/linkColors.ts @@ -1,5 +1,5 @@ import type { CanvasColour, ISlotType } from '../interfaces' -import { LiteGraph } from '../litegraph' +import { litegraph } from '../litegraphInstance' /** * Resolve the colour used while rendering or previewing a connection of a given slot type. @@ -7,7 +7,7 @@ import { LiteGraph } from '../litegraph' export function resolveConnectingLinkColor( type: ISlotType | undefined ): CanvasColour { - return type === LiteGraph.EVENT - ? LiteGraph.EVENT_LINK_COLOR - : LiteGraph.CONNECTING_LINK_COLOR + return type === litegraph().EVENT + ? litegraph().EVENT_LINK_COLOR + : litegraph().CONNECTING_LINK_COLOR } diff --git a/src/lib/litegraph/src/widgets/ComboWidget.ts b/src/lib/litegraph/src/widgets/ComboWidget.ts index 8d16ea2ba73..613f653cd97 100644 --- a/src/lib/litegraph/src/widgets/ComboWidget.ts +++ b/src/lib/litegraph/src/widgets/ComboWidget.ts @@ -2,7 +2,7 @@ import { clamp } from 'es-toolkit/compat' import type { IContextMenuValue } from '@/lib/litegraph/src/types/contextMenu' import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode' -import { LiteGraph } from '@/lib/litegraph/src/litegraph' +import { litegraph } from '@/lib/litegraph/src/litegraphInstance' import type { ComboWidgetValues, IComboWidget, @@ -169,7 +169,7 @@ export class ComboWidget } } } - const menu = new LiteGraph.ContextMenu([], menuOptions) + const menu = new (litegraph().ContextMenu)([], menuOptions) const getOptionLabel = this.options.getOptionLabel for (const value of values_list) { @@ -187,7 +187,7 @@ export class ComboWidget // Show dropdown menu when user clicks on widget label const text_values = values != values_list ? Object.values(values) : values - new LiteGraph.ContextMenu(text_values, { + new (litegraph().ContextMenu)(text_values, { scale: Math.max(1, canvas.ds.scale), event: e, className: 'dark', diff --git a/src/lib/litegraph/src/widgets/LegacyWidget.ts b/src/lib/litegraph/src/widgets/LegacyWidget.ts index 1c48bb3255d..11faf94914f 100644 --- a/src/lib/litegraph/src/widgets/LegacyWidget.ts +++ b/src/lib/litegraph/src/widgets/LegacyWidget.ts @@ -1,5 +1,5 @@ import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode' -import { LiteGraph } from '@/lib/litegraph/src/litegraph' +import { litegraph } from '@/lib/litegraph/src/litegraphInstance' import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets' import { BaseWidget } from './BaseWidget' @@ -28,7 +28,7 @@ export class LegacyWidget ctx: CanvasRenderingContext2D, options: DrawWidgetOptions ) { - const H = LiteGraph.NODE_WIDGET_HEIGHT + const H = litegraph().NODE_WIDGET_HEIGHT this.draw?.(ctx, this.node, options.width, this.y, H, !!options.showText) } diff --git a/src/renderer/core/canvas/links/linkDropOrchestrator.test.ts b/src/renderer/core/canvas/links/linkDropOrchestrator.test.ts index 969ab09c40b..fa01fdd924e 100644 --- a/src/renderer/core/canvas/links/linkDropOrchestrator.test.ts +++ b/src/renderer/core/canvas/links/linkDropOrchestrator.test.ts @@ -1,8 +1,7 @@ import { fromPartial } from '@total-typescript/shoehorn' import { beforeEach, describe, expect, it, vi } from 'vitest' -import { LGraph } from '@/lib/litegraph/src/LGraph' -import { LGraphNode } from '@/lib/litegraph/src/LGraphNode' +import { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph' import type { LinkConnectorAdapter } from '@/renderer/core/canvas/links/linkConnectorAdapter' import { useSlotLinkDragUIState } from '@/renderer/core/canvas/links/slotLinkDragUIState' import { getSlotKey } from '@/renderer/core/layout/slots/slotIdentifier' diff --git a/src/renderer/core/canvas/litegraph/litegraphLinkAdapter.ts b/src/renderer/core/canvas/litegraph/litegraphLinkAdapter.ts index 7ddfc0c7b17..3d0f0d17578 100644 --- a/src/renderer/core/canvas/litegraph/litegraphLinkAdapter.ts +++ b/src/renderer/core/canvas/litegraph/litegraphLinkAdapter.ts @@ -9,7 +9,7 @@ import type { LLink } from '@/lib/litegraph/src/LLink' import type { Reroute } from '@/lib/litegraph/src/Reroute' import type { CanvasColour, Point } from '@/lib/litegraph/src/interfaces' -import { LiteGraph } from '@/lib/litegraph/src/litegraph' +import { litegraph } from '@/lib/litegraph/src/litegraphInstance' import { LinkDirection, LinkMarkerShape, @@ -117,7 +117,7 @@ export class LitegraphLinkAdapter { disabled: context.disabledPattern }, animation: { - time: LiteGraph.getTime() * 0.001 + time: litegraph().getTime() * 0.001 }, scale: context.scale, highlightedIds: new Set(Array.from(context.highlightedLinks).map(String)) diff --git a/src/renderer/core/canvas/litegraph/selectionAdapter.ts b/src/renderer/core/canvas/litegraph/selectionAdapter.ts index 70aefa35c7c..390952dde07 100644 --- a/src/renderer/core/canvas/litegraph/selectionAdapter.ts +++ b/src/renderer/core/canvas/litegraph/selectionAdapter.ts @@ -9,12 +9,10 @@ import { import type { LGraph } from '@/lib/litegraph/src/LGraph' import type { LGraphCanvas } from '@/lib/litegraph/src/LGraphCanvas' import type { Positionable } from '@/lib/litegraph/src/interfaces' -import { - LGraphGroup, - LGraphNode, - Reroute, - Subgraph -} from '@/lib/litegraph/src/litegraph' +import { LGraphGroup } from '@/lib/litegraph/src/LGraphGroup' +import { LGraphNode } from '@/lib/litegraph/src/LGraphNode' +import { Reroute } from '@/lib/litegraph/src/Reroute' +import { Subgraph } from '@/lib/litegraph/src/LGraph' import { SubgraphIONodeBase } from '@/lib/litegraph/src/subgraph/SubgraphIONodeBase' import type { SubgraphInputNode } from '@/lib/litegraph/src/subgraph/SubgraphInputNode' import type { SubgraphOutputNode } from '@/lib/litegraph/src/subgraph/SubgraphOutputNode' diff --git a/src/renderer/core/canvas/litegraph/slotCalculations.test.ts b/src/renderer/core/canvas/litegraph/slotCalculations.test.ts index 969aedf10d3..55c4d14202d 100644 --- a/src/renderer/core/canvas/litegraph/slotCalculations.test.ts +++ b/src/renderer/core/canvas/litegraph/slotCalculations.test.ts @@ -1,17 +1,7 @@ import { fromPartial } from '@total-typescript/shoehorn' -import { beforeEach, describe, expect, it, vi } from 'vitest' - -const mockLiteGraph = vi.hoisted(() => ({ - NODE_TITLE_HEIGHT: 30, - NODE_SLOT_HEIGHT: 20, - NODE_COLLAPSED_WIDTH: 80, - vueNodesMode: false -})) - -vi.mock(import('@/lib/litegraph/src/litegraph'), () => ({ - LiteGraph: mockLiteGraph -})) +import { beforeEach, describe, expect, it } from 'vitest' +import { LiteGraph } from '@/lib/litegraph/src/litegraph' import type { LGraph } from '@/lib/litegraph/src/LGraph' import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode' import type { @@ -31,8 +21,15 @@ import { } from './slotCalculations' import type { SlotPositionContext } from './slotCalculations' -const SLOT_HEIGHT = mockLiteGraph.NODE_SLOT_HEIGHT -const TITLE_HEIGHT = mockLiteGraph.NODE_TITLE_HEIGHT +const SLOT_HEIGHT = 20 +const TITLE_HEIGHT = 30 + +beforeEach(() => { + const previousMode = LiteGraph.vueNodesMode + return () => { + LiteGraph.vueNodesMode = previousMode + } +}) function makeContext( overrides: Partial = {} @@ -79,7 +76,7 @@ function makeNode( flags: { collapsed: overrides.collapsed ?? false }, title_mode: overrides.titleMode ?? TitleMode.NORMAL_TITLE, type: overrides.type ?? 'TestNode', - _collapsed_width: mockLiteGraph.NODE_COLLAPSED_WIDTH, + _collapsed_width: 80, constructor: { slot_start_y: undefined }, inputs: overrides.inputs ?? [], outputs: overrides.outputs ?? [], @@ -180,7 +177,7 @@ describe('calculateInputSlotPosFromSlot', () => { describe('getSlotPosition — legacy fallback (vueNodesMode disabled)', () => { beforeEach(() => { - mockLiteGraph.vueNodesMode = false + LiteGraph.vueNodesMode = false }) it('calculates input slot position from node.pos', () => { @@ -211,7 +208,7 @@ describe('getSlotPosition — legacy fallback (vueNodesMode disabled)', () => { const output = makeOutput() const node = makeNode({ outputs: [output], collapsed: true }) const [x, y] = getSlotPosition(node, 0, false) - expect(x).toBe(100 + mockLiteGraph.NODE_COLLAPSED_WIDTH) + expect(x).toBe(180) expect(y).toBe(200 - TITLE_HEIGHT * 0.5) }) @@ -225,7 +222,7 @@ describe('getSlotPosition — legacy fallback (vueNodesMode disabled)', () => { describe('Vue slot geometry', () => { beforeEach(() => { - mockLiteGraph.vueNodesMode = true + LiteGraph.vueNodesMode = true layoutStore.resetForTests() }) diff --git a/src/renderer/core/canvas/litegraph/slotCalculations.ts b/src/renderer/core/canvas/litegraph/slotCalculations.ts index 7bf77fbb6fc..8232a4fcf3b 100644 --- a/src/renderer/core/canvas/litegraph/slotCalculations.ts +++ b/src/renderer/core/canvas/litegraph/slotCalculations.ts @@ -12,7 +12,7 @@ import type { INodeInputSlot, INodeOutputSlot } from '@/lib/litegraph/src/types/slots' -import { LiteGraph } from '@/lib/litegraph/src/litegraph' +import { litegraph } from '@/lib/litegraph/src/litegraphInstance' import { isWidgetInputSlot } from '@/lib/litegraph/src/node/slotUtils' import { TitleMode } from '@/lib/litegraph/src/types/globalEnums' import { nodesInRenderOrder } from '@/renderer/core/canvas/litegraph/arrangeForLegacyRender' @@ -76,7 +76,7 @@ export function calculateInputSlotPosFromSlot( // Handle collapsed nodes if (collapsed) { - const halfTitle = LiteGraph.NODE_TITLE_HEIGHT * 0.5 + const halfTitle = litegraph().NODE_TITLE_HEIGHT * 0.5 return [nodeX, nodeY - halfTitle] } @@ -85,7 +85,7 @@ export function calculateInputSlotPosFromSlot( if (pos) return [nodeX + pos[0], nodeY + pos[1]] // Default vertical slots - const offsetX = LiteGraph.NODE_SLOT_HEIGHT * 0.5 + const offsetX = litegraph().NODE_SLOT_HEIGHT * 0.5 const nodeOffsetY = context.slotStartY || 0 let slotIndex = -1 const inputIndex = context.inputs.indexOf(input) @@ -99,7 +99,7 @@ export function calculateInputSlotPosFromSlot( } } } - const slotY = (slotIndex + 0.7) * LiteGraph.NODE_SLOT_HEIGHT + const slotY = (slotIndex + 0.7) * litegraph().NODE_SLOT_HEIGHT return [nodeX + offsetX, nodeY + slotY + nodeOffsetY] } @@ -119,8 +119,8 @@ function calculateOutputSlotPos( // Handle collapsed nodes if (collapsed) { - const width = collapsedWidth || LiteGraph.NODE_COLLAPSED_WIDTH - const halfTitle = LiteGraph.NODE_TITLE_HEIGHT * 0.5 + const width = collapsedWidth || litegraph().NODE_COLLAPSED_WIDTH + const halfTitle = litegraph().NODE_TITLE_HEIGHT * 0.5 return [nodeX + width, nodeY - halfTitle] } @@ -132,11 +132,11 @@ function calculateOutputSlotPos( if (outputPos) return [nodeX + outputPos[0], nodeY + outputPos[1]] // Default vertical slots - const offsetX = LiteGraph.NODE_SLOT_HEIGHT * 0.5 + const offsetX = litegraph().NODE_SLOT_HEIGHT * 0.5 const nodeOffsetY = context.slotStartY || 0 const defaultVerticalOutputs = getDefaultVerticalOutputs(context) const slotIndex = defaultVerticalOutputs.indexOf(outputSlot) - const slotY = (slotIndex + 0.7) * LiteGraph.NODE_SLOT_HEIGHT + const slotY = (slotIndex + 0.7) * litegraph().NODE_SLOT_HEIGHT // TODO: Why +1? return [nodeX + nodeWidth + 1 - offsetX, nodeY + slotY + nodeOffsetY] @@ -154,7 +154,7 @@ export function getSlotPosition( slotIndex: number, isInput: boolean ): Point { - if (LiteGraph.vueNodesMode) + if (litegraph().vueNodesMode) return getVueSlotPosition(node, slotIndex, isInput) const context: SlotPositionContext = { @@ -185,7 +185,7 @@ function getVueSlotPosition( if (offset) return [nodeX + offset.x, nodeY + offset.y] const nodeWidth = node.flags.collapsed - ? (node._collapsed_width ?? LiteGraph.NODE_COLLAPSED_WIDTH) + ? (node._collapsed_width ?? litegraph().NODE_COLLAPSED_WIDTH) : node.renderingSize[0] return calculateVueSlotPosition( node, @@ -223,7 +223,7 @@ function calculateVueSlotPosition( if (node.flags.collapsed) { return [ isInput ? nodeX : nodeX + nodeWidth, - nodeY - LiteGraph.NODE_TITLE_HEIGHT * 0.5 + nodeY - litegraph().NODE_TITLE_HEIGHT * 0.5 ] } @@ -265,7 +265,7 @@ function getWidgetSlotY( const widget = input._widget ?? node.widgets?.find((candidate) => candidate.name === input.widget.name) - return widget && widget.y + LiteGraph.NODE_SLOT_HEIGHT * 0.5 + return widget && widget.y + litegraph().NODE_SLOT_HEIGHT * 0.5 } function calculateVueOutputSlotPosition( @@ -288,13 +288,13 @@ function calculateVueOutputSlotPosition( function getVueSlotY(node: LGraphNode, slotIndex: number): number { return ( (slotIndex + (node.type === 'Reroute' ? 0.5 : 0.7)) * - LiteGraph.NODE_SLOT_HEIGHT + litegraph().NODE_SLOT_HEIGHT ) } function getVueNodeContentY(node: LGraphNode, nodeY: number): number { return node.title_mode === TitleMode.NO_TITLE - ? nodeY - LiteGraph.NODE_TITLE_HEIGHT + ? nodeY - litegraph().NODE_TITLE_HEIGHT : nodeY } @@ -320,7 +320,7 @@ function createSlotLayout( isInput: boolean, [x, y]: Point ): SlotLayout { - const size = LiteGraph.NODE_SLOT_HEIGHT + const size = litegraph().NODE_SLOT_HEIGHT const half = size * 0.5 return { nodeId: node.id,