From 0d805403551db6d008871541d675a998447aef10 Mon Sep 17 00:00:00 2001 From: jaeone94 <89377375+jaeone94@users.noreply.github.com> Date: Thu, 17 Sep 2026 09:12:37 +0900 Subject: [PATCH 1/8] fix: order hidden link badges by socket position and reuse hitboxes --- .../src/LGraphCanvas.drawConnections.test.ts | 94 ++++++++ .../src/LGraphCanvas.linkVisibility.test.ts | 22 +- src/lib/litegraph/src/LGraphCanvas.ts | 4 +- .../canvas/getCanvasContextMenuTarget.test.ts | 44 ++-- .../litegraph/src/canvas/linkBadgeRenderer.ts | 44 ++-- .../litegraph/src/canvas/linkBadges.test.ts | 78 +++++-- src/lib/litegraph/src/canvas/linkBadges.ts | 221 +++++++----------- 7 files changed, 292 insertions(+), 215 deletions(-) diff --git a/src/lib/litegraph/src/LGraphCanvas.drawConnections.test.ts b/src/lib/litegraph/src/LGraphCanvas.drawConnections.test.ts index bda76643f2d..a7f0f39d6b6 100644 --- a/src/lib/litegraph/src/LGraphCanvas.drawConnections.test.ts +++ b/src/lib/litegraph/src/LGraphCanvas.drawConnections.test.ts @@ -1000,6 +1000,100 @@ describe('drawConnections hidden links', () => { ]) }) + it.for([false, true])( + 'orders both ends by displayed slot position with reversed creation %s', + (reverseCreation) => { + const source = new LGraphNode('Source') + source.pos = [0, 100] + source.addOutput('upper', 'STRING').pos = [150, 10] + source.addOutput('lower', 'STRING').pos = [150, 20] + graph.add(source) + const target = new LGraphNode('Target') + target.pos = [400, 100] + target.addInput('upper', 'STRING').pos = [0, 10] + target.addInput('lower', 'STRING').pos = [0, 20] + graph.add(target) + + const slots = reverseCreation ? [1, 0] : [0, 1] + const links = slots.map((slot) => + createTestLink(graph, source, slot, target, 1 - slot) + ) + const upperOutputLink = links.find((link) => link.origin_slot === 0) + const upperInputLink = links.find((link) => link.target_slot === 0) + if (!upperOutputLink || !upperInputLink) + throw new Error('Missing crossed links') + const scope = graphScopeOf(graph) + const presentationStore = useLinkPresentationStore() + for (const link of links.toReversed()) { + presentationStore.patch(scope, link.id, { hidden: true }) + } + + canvas.drawConnections(createMockCtx()) + + expect(queryLinkBadgeAtPoint(canvas, 170, 110)).toBe(upperOutputLink.id) + expect(queryLinkBadgeAtPoint(canvas, 170, 132)).toBe(upperInputLink.id) + expect(queryLinkBadgeAtPoint(canvas, 380, 110)).toBe(upperInputLink.id) + expect(queryLinkBadgeAtPoint(canvas, 380, 132)).toBe(upperOutputLink.id) + + vi.stubGlobal('Path2D', StubPath2D) + canvas.processMouseMove( + new PointerEvent('pointermove', { + clientX: 380, + clientY: 132, + isPrimary: false + }) + ) + expect(isLinkRevealed(scope.rootGraphId, upperOutputLink.id)).toBe(true) + const renderLink = vi.spyOn(canvas, 'renderLink') + const ctx = createMockCtx() + + canvas.drawConnections(ctx) + + const inputBadge = vi + .mocked(ctx.roundRect) + .mock.calls.find( + ([x, y, width, height]) => + x < 380 && x + width > 380 && y < 132 && y + height > 132 + ) + expect(inputBadge).toBeDefined() + expect(renderLink).toHaveBeenCalledOnce() + expect(renderLink.mock.calls[0][2]).toEqual([inputBadge?.[0], 132]) + } + ) + + it('follows widget rows when their input slot indices run in reverse', () => { + const source = new LGraphNode('Source') + source.pos = [0, 100] + source.addOutput('first', 'STRING') + source.addOutput('second', 'STRING') + graph.add(source) + const target = new LGraphNode('Target') + target.pos = [400, 100] + const upperWidget = target.addWidget('text', 'upper', '', null) + upperWidget.computeSize = () => [100, 6] + const lowerWidget = target.addWidget('text', 'lower', '', null) + target.addInput('lower', 'STRING').widget = { name: 'lower' } + target.addInput('upper', 'STRING').widget = { name: 'upper' } + graph.add(target) + const lowerLink = createTestLink(graph, source, 0, target, 0) + const upperLink = createTestLink(graph, source, 1, target, 1) + const presentationStore = useLinkPresentationStore() + for (const link of [lowerLink, upperLink]) { + presentationStore.patch(graphScopeOf(graph), link.id, { hidden: true }) + } + + const ctx = createMockCtx() + canvas.drawConnections(ctx) + + expect(upperWidget.y).toBeLessThan(lowerWidget.y) + const [socketX, socketY] = target.getInputPos(1) + const badgeX = socketX - BADGE_GAP - 4 + expect(queryLinkBadgeAtPoint(canvas, badgeX, socketY)).toBe(upperLink.id) + expect(queryLinkBadgeAtPoint(canvas, badgeX, socketY + 22)).toBe( + lowerLink.id + ) + }) + it('suppresses reroutes until the full routed link is revealed', () => { const link = createHiddenLink() const reroute = graph.createReroute([225, 150], link) diff --git a/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts b/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts index 75b0ae4a7d8..20901646ac0 100644 --- a/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts +++ b/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts @@ -217,16 +217,18 @@ describe('LGraphCanvas link visibility interactions', () => { useLinkPresentationStore().patch(graphScopeOf(graph), link.id, { hidden: true }) - const layout = layoutHiddenLinkBadges( - canvas, - canvas.ctx, - link, - { hidden: true }, - [400, 300], - [700, 300], - '#89A' - ) - drawHiddenLinkBadges(canvas.ctx, layout, [0, 0, 800, 600]) + const layouts = layoutHiddenLinkBadges(canvas, canvas.ctx, [ + { + link, + presentation: { hidden: true }, + startPos: [400, 300], + endPos: [700, 300], + color: '#89A' + } + ]) + for (const layout of layouts.values()) { + drawHiddenLinkBadges(canvas.ctx, layout, [0, 0, 800, 600]) + } const prompt = vi .spyOn(canvas, 'prompt') .mockReturnValue(document.createElement('div')) diff --git a/src/lib/litegraph/src/LGraphCanvas.ts b/src/lib/litegraph/src/LGraphCanvas.ts index aa03180830f..adc92c5aa08 100644 --- a/src/lib/litegraph/src/LGraphCanvas.ts +++ b/src/lib/litegraph/src/LGraphCanvas.ts @@ -6139,8 +6139,8 @@ export class LGraphCanvas implements CustomEventDispatcher this._renderAllLinkSegments( ctx, link, - hiddenLayout?.outputTip ?? startPos, - hiddenLayout?.inputTip ?? endPos, + hiddenLayout?.output.tip ?? startPos, + hiddenLayout?.input.tip ?? endPos, visibleReroutes, renderedRerouteSegments, now, diff --git a/src/lib/litegraph/src/canvas/getCanvasContextMenuTarget.test.ts b/src/lib/litegraph/src/canvas/getCanvasContextMenuTarget.test.ts index 2b8ef95d5a0..94f9d5f352e 100644 --- a/src/lib/litegraph/src/canvas/getCanvasContextMenuTarget.test.ts +++ b/src/lib/litegraph/src/canvas/getCanvasContextMenuTarget.test.ts @@ -184,16 +184,18 @@ describe('getCanvasContextMenuTarget', () => { it('returns a hidden link hit on its badge', () => { const link = createLink(5) hide(link) - const layout = layoutHiddenLinkBadges( - canvas, - canvas.ctx, - link, - { hidden: true }, - [-10, 20], - [200, 20], - '#cab8ff' - ) - drawHiddenLinkBadges(canvas.ctx, layout, [0, 0, 800, 600]) + const layouts = layoutHiddenLinkBadges(canvas, canvas.ctx, [ + { + link, + presentation: { hidden: true }, + startPos: [-10, 20], + endPos: [200, 20], + color: '#cab8ff' + } + ]) + for (const layout of layouts.values()) { + drawHiddenLinkBadges(canvas.ctx, layout, [0, 0, 800, 600]) + } const target = resolve() expect(target.group).toBe(group) @@ -248,16 +250,18 @@ describe('getCanvasContextMenuTarget', () => { const link = createLink(5) hide(link) mockQueryRerouteAtPoint.mockReturnValue({ id: 9 }) - const layout = layoutHiddenLinkBadges( - canvas, - canvas.ctx, - link, - { hidden: true }, - [-10, 20], - [200, 20], - '#cab8ff' - ) - drawHiddenLinkBadges(canvas.ctx, layout, [0, 0, 800, 600]) + const layouts = layoutHiddenLinkBadges(canvas, canvas.ctx, [ + { + link, + presentation: { hidden: true }, + startPos: [-10, 20], + endPos: [200, 20], + color: '#cab8ff' + } + ]) + for (const layout of layouts.values()) { + drawHiddenLinkBadges(canvas.ctx, layout, [0, 0, 800, 600]) + } const target = resolve() diff --git a/src/lib/litegraph/src/canvas/linkBadgeRenderer.ts b/src/lib/litegraph/src/canvas/linkBadgeRenderer.ts index 40fc7720555..d100cdbe089 100644 --- a/src/lib/litegraph/src/canvas/linkBadgeRenderer.ts +++ b/src/lib/litegraph/src/canvas/linkBadgeRenderer.ts @@ -1,9 +1,7 @@ import type { LGraph } from '../LGraph' import type { LLink } from '../LLink' -import type { LinkId } from '@/types/linkId' -import type { LinkBadgeLayout } from './linkBadges' +import type { HiddenLinkBadge } from './linkBadges' import { graphScopeOf } from '@/types/graphScopeId' -import { compareNodeIds } from '@/types/nodeId' import { useLinkPresentationStore } from '@/stores/linkPresentationStore' import { layoutHiddenLinkBadges, queryLinkBadgeAtPoint } from './linkBadges' import { getLinkEndpointPositions } from './linkGeometry' @@ -32,41 +30,27 @@ export function layoutGraphLinkBadges( graph: LGraph, linkTypeColors: Readonly>, defaultLinkColor: string -): Map { +): ReturnType { const scope = graphScopeOf(graph) const presentationStore = useLinkPresentationStore() - const hiddenLinks: LLink[] = [] + const hiddenLinks: HiddenLinkBadge[] = [] for (const linkId of presentationStore.graphHiddenLinkIds(scope)) { const link = graph.getLink(linkId) - if (link) hiddenLinks.push(link) - } - hiddenLinks.sort( - (first, second) => - compareNodeIds(first.origin_id, second.origin_id) || - first.origin_slot - second.origin_slot || - first.id - second.id - ) - const layouts = new Map() - for (const link of hiddenLinks) { + if (!link) continue const endpoints = getLinkEndpointPositions(graph, link) const presentation = presentationStore.getPresentation(scope, link.id) if (!endpoints || !presentation) continue - const [startPos, endPos] = endpoints - layouts.set( - link.id, - layoutHiddenLinkBadges( - host, - ctx, - link, - presentation, - startPos, - endPos, + hiddenLinks.push({ + link, + presentation, + startPos: endpoints[0], + endPos: endpoints[1], + color: (typeof link.color === 'string' && link.color) || - linkTypeColors[link.type] || - defaultLinkColor - ) - ) + linkTypeColors[link.type] || + defaultLinkColor + }) } - return layouts + return layoutHiddenLinkBadges(host, ctx, hiddenLinks) } diff --git a/src/lib/litegraph/src/canvas/linkBadges.test.ts b/src/lib/litegraph/src/canvas/linkBadges.test.ts index 99eaaa87213..04432625d5c 100644 --- a/src/lib/litegraph/src/canvas/linkBadges.test.ts +++ b/src/lib/litegraph/src/canvas/linkBadges.test.ts @@ -36,17 +36,18 @@ function drawBadgesInView( endPos: Point, visibleArea: ReadOnlyRect = VISIBLE_AREA ) { - const layout = layoutHiddenLinkBadges( - host, - ctx, - link, - { hidden: true }, - startPos, - endPos, - BADGE_COLOR - ) - drawHiddenLinkBadges(ctx, layout, visibleArea) - return layout + const layouts = layoutHiddenLinkBadges(host, ctx, [ + { + link, + presentation: { hidden: true }, + startPos, + endPos, + color: BADGE_COLOR + } + ]) + for (const layout of layouts.values()) { + drawHiddenLinkBadges(ctx, layout, visibleArea) + } } describe('linkBadgeText', () => { @@ -145,9 +146,29 @@ describe('link badge frame layout', () => { it('stacks overlapping endpoint badges into disjoint bands', () => { const host = document.createElement('canvas') const ctx = createContext() - drawBadgesInView(host, ctx, createLink(1, 'IMAGE'), [100, 100], [400, 200]) - drawBadgesInView(host, ctx, createLink(2, 'IMAGE'), [100, 100], [400, 300]) - drawBadgesInView(host, ctx, createLink(3, 'MASK'), [100, 118], [400, 400]) + layoutHiddenLinkBadges(host, ctx, [ + { + link: createLink(3, 'MASK'), + presentation: { hidden: true }, + startPos: [100, 118], + endPos: [400, 400], + color: BADGE_COLOR + }, + { + link: createLink(2, 'IMAGE'), + presentation: { hidden: true }, + startPos: [100, 100], + endPos: [400, 300], + color: BADGE_COLOR + }, + { + link: createLink(1, 'IMAGE'), + presentation: { hidden: true }, + startPos: [100, 100], + endPos: [400, 200], + color: BADGE_COLOR + } + ]) expect(queryLinkBadgeAtPoint(host, 120, 100)).toBe(toLinkId(1)) expect(queryLinkBadgeAtPoint(host, 120, 122)).toBe(toLinkId(2)) @@ -159,17 +180,20 @@ describe('link badge frame layout', () => { it('culls using reversed and stacked badge extents', () => { const host = document.createElement('canvas') const ctx = createContext() - drawBadgesInView(host, ctx, createLink(1), [400, 100], [100, 100]) - vi.mocked(ctx.fillText).mockClear() - - drawBadgesInView( + const layouts = layoutHiddenLinkBadges( host, ctx, - createLink(2), - [400, 100], - [100, 100], - [414, 113, 10, 18] + [1, 2].map((id) => ({ + link: createLink(id), + presentation: { hidden: true }, + startPos: [400, 100], + endPos: [100, 100], + color: BADGE_COLOR + })) ) + for (const layout of layouts.values()) { + drawHiddenLinkBadges(ctx, layout, [414, 113, 10, 18]) + } expect(queryLinkBadgeAtPoint(host, 420, 122)).toBe(toLinkId(2)) expect(ctx.fillText).toHaveBeenCalledWith('MODEL', 420, 123) @@ -178,6 +202,16 @@ describe('link badge frame layout', () => { it.for([ { name: 'visible', visibleArea: VISIBLE_AREA, paintCount: 2 }, + { + name: 'output-only visible', + visibleArea: [120, 95, 1, 1], + paintCount: 2 + }, + { + name: 'input-only visible', + visibleArea: [330, 195, 1, 1], + paintCount: 2 + }, { name: 'culled', visibleArea: [5000, 5000, 10, 10], paintCount: 0 } ] satisfies { name: string diff --git a/src/lib/litegraph/src/canvas/linkBadges.ts b/src/lib/litegraph/src/canvas/linkBadges.ts index 3e72d8c5eff..98541d3d467 100644 --- a/src/lib/litegraph/src/canvas/linkBadges.ts +++ b/src/lib/litegraph/src/canvas/linkBadges.ts @@ -5,6 +5,8 @@ import { LGraphBadge } from '../LGraphBadge' import type { LLink } from '../LLink' import type { LinkId } from '@/types/linkId' import type { LinkPresentation } from '@/types/linkPresentation' +import { compareNodeIds } from '@/types/nodeId' +import type { NodeId } from '@/types/nodeId' import { overlapBounding } from '../measure' export const BADGE_GAP = 14 @@ -16,21 +18,31 @@ const BADGE_CONNECT_INSET = 2 interface BadgeHitArea extends HasBoundingRect { readonly linkId: LinkId + readonly boundingRect: Rect } -export interface LinkBadgeLayout { - linkId: LinkId +export interface HiddenLinkBadge { + link: LLink + presentation: Readonly + startPos: Point + endPos: Point + color: string +} + +interface LinkBadgePair { badge: LGraphBadge color: string - width: number - outputSocket: Point - outputBadgeX: number - outputBadgeY: number - inputSocket: Point - inputBadgeX: number - inputBadgeY: number - outputTip: Point - inputTip: Point + output: BadgeEndpoint + input: BadgeEndpoint +} + +interface BadgeEndpoint { + nodeId: NodeId + slot: number + side: 'input' | 'output' + socket: Point + hitArea: BadgeHitArea + tip: Point } const hitAreasByHost = new WeakMap() @@ -107,92 +119,68 @@ function freeBadgeCenterY( return centerY } -function createHitArea( - linkId: LinkId, - left: number, - centerY: number, +function createBadgeEndpoint( + link: LLink, + side: BadgeEndpoint['side'], + socket: Point, width: number -): BadgeHitArea { +): BadgeEndpoint { + const isOutput = side === 'output' + const left = isOutput ? socket[0] + BADGE_GAP : socket[0] - BADGE_GAP - width return { - linkId, - boundingRect: [left, centerY - BADGE_HEIGHT / 2, width, BADGE_HEIGHT] + nodeId: isOutput ? link.origin_id : link.target_id, + slot: isOutput ? link.origin_slot : link.target_slot, + side, + socket, + hitArea: { + linkId: link.id, + boundingRect: [left, socket[1] - BADGE_HEIGHT / 2, width, BADGE_HEIGHT] + }, + tip: [isOutput ? left + width : left, socket[1]] } } +function compareBadgeEndpoints( + first: BadgeEndpoint, + second: BadgeEndpoint +): number { + const nodeOrder = compareNodeIds(first.nodeId, second.nodeId) + if (nodeOrder) return nodeOrder + if (first.side !== second.side) return first.side === 'output' ? -1 : 1 + return ( + first.socket[1] - second.socket[1] || + first.slot - second.slot || + first.hitArea.linkId - second.hitArea.linkId + ) +} + export function layoutHiddenLinkBadges( host: object, ctx: CanvasRenderingContext2D, - link: LLink, - presentation: Readonly, - startPos: Point, - endPos: Point, - color: string -): LinkBadgeLayout { - const hitAreas = hitAreasByHost.get(host) ?? [] - const text = linkBadgeText(link.type, presentation) - - const badge = makeBadge(text, color) - const width = badge.getWidth(ctx) - const [outputSocketX, outputSocketY] = startPos - const outputBadgeX = outputSocketX + BADGE_GAP - const outputBadgeY = freeBadgeCenterY( - hitAreas, - outputBadgeX, - outputSocketY, - width - ) - const outputHitArea = createHitArea( - link.id, - outputBadgeX, - outputBadgeY, - width - ) - - const [inputSocketX, inputSocketY] = endPos - const inputBadgeX = inputSocketX - BADGE_GAP - width - const inputBadgeY = freeBadgeCenterY( - [...hitAreas, outputHitArea], - inputBadgeX, - inputSocketY, - width - ) - - const layout: LinkBadgeLayout = { - linkId: link.id, - badge, - color, - width, - outputSocket: startPos, - outputBadgeX, - outputBadgeY, - inputSocket: endPos, - inputBadgeX, - inputBadgeY, - outputTip: [outputBadgeX + width, outputBadgeY], - inputTip: [inputBadgeX, inputBadgeY] + hiddenLinks: readonly HiddenLinkBadge[] +): Map { + const layouts = new Map() + const endpoints: BadgeEndpoint[] = [] + for (const { link, presentation, startPos, endPos, color } of hiddenLinks) { + const badge = makeBadge(linkBadgeText(link.type, presentation), color) + const width = badge.getWidth(ctx) + const output = createBadgeEndpoint(link, 'output', startPos, width) + const input = createBadgeEndpoint(link, 'input', endPos, width) + layouts.set(link.id, { badge, color, output, input }) + endpoints.push(output, input) + } + endpoints.sort(compareBadgeEndpoints) + + const hitAreas: BadgeHitArea[] = [] + for (const { hitArea, socket, tip } of endpoints) { + const [left, , width] = hitArea.boundingRect + const centerY = freeBadgeCenterY(hitAreas, left, socket[1], width) + hitArea.boundingRect[1] = centerY - BADGE_HEIGHT / 2 + tip[1] = centerY + hitAreas.push(hitArea) } - hitAreas.push(...getBadgeHitAreas(layout)) hitAreasByHost.set(host, hitAreas) - return layout -} - -function getBadgeHitAreas( - layout: LinkBadgeLayout -): [BadgeHitArea, BadgeHitArea] { - return [ - createHitArea( - layout.linkId, - layout.outputBadgeX, - layout.outputBadgeY, - layout.width - ), - createHitArea( - layout.linkId, - layout.inputBadgeX, - layout.inputBadgeY, - layout.width - ) - ] + return layouts } function getConnectorBounds(socket: Point, area: BadgeHitArea): Rect { @@ -221,53 +209,24 @@ function drawConnector( ctx.restore() } -function drawBadgeLayout( - ctx: CanvasRenderingContext2D, - layout: LinkBadgeLayout -): void { - drawConnector( - ctx, - layout.outputSocket, - [layout.outputBadgeX + BADGE_CONNECT_INSET, layout.outputBadgeY], - layout.color - ) - layout.badge.draw( - ctx, - layout.outputBadgeX, - layout.outputBadgeY - BADGE_HEIGHT / 2 - ) - drawConnector( - ctx, - layout.inputSocket, - [ - layout.inputBadgeX + layout.width - BADGE_CONNECT_INSET, - layout.inputBadgeY - ], - layout.color - ) - layout.badge.draw( - ctx, - layout.inputBadgeX, - layout.inputBadgeY - BADGE_HEIGHT / 2 - ) -} - export function drawHiddenLinkBadges( ctx: CanvasRenderingContext2D, - layout: LinkBadgeLayout, + layout: LinkBadgePair, visibleArea: ReadOnlyRect ): void { - const endpointHitAreas = getBadgeHitAreas(layout) - if ( - overlapBounding( - getConnectorBounds(layout.outputSocket, endpointHitAreas[0]), - visibleArea - ) || - overlapBounding( - getConnectorBounds(layout.inputSocket, endpointHitAreas[1]), - visibleArea - ) - ) { - drawBadgeLayout(ctx, layout) + const endpoints = [layout.output, layout.input] + const visible = endpoints.some(({ socket, hitArea }) => + overlapBounding(getConnectorBounds(socket, hitArea), visibleArea) + ) + if (!visible) return + + for (const { side, socket, hitArea } of endpoints) { + const [left, top, width, height] = hitArea.boundingRect + const connectorX = + side === 'output' + ? left + BADGE_CONNECT_INSET + : left + width - BADGE_CONNECT_INSET + drawConnector(ctx, socket, [connectorX, top + height / 2], layout.color) + layout.badge.draw(ctx, left, top) } } From 4355b7088822b62281b46ec5a90f80025cbecd8d Mon Sep 17 00:00:00 2001 From: jaeone94 <89377375+jaeone94@users.noreply.github.com> Date: Thu, 17 Sep 2026 10:38:07 +0900 Subject: [PATCH 2/8] fix: preserve hidden link reveal lifecycle --- .../src/LGraphCanvas.drawConnections.test.ts | 23 +++++ src/lib/litegraph/src/LGraphCanvas.ts | 6 +- .../litegraph/src/canvas/linkBadges.test.ts | 51 ++++++++++ .../useSlotLinkInteraction.autoPan.test.ts | 92 +++++++++++++++++-- .../composables/useSlotLinkInteraction.ts | 4 + 5 files changed, 167 insertions(+), 9 deletions(-) diff --git a/src/lib/litegraph/src/LGraphCanvas.drawConnections.test.ts b/src/lib/litegraph/src/LGraphCanvas.drawConnections.test.ts index a7f0f39d6b6..10cc2daebed 100644 --- a/src/lib/litegraph/src/LGraphCanvas.drawConnections.test.ts +++ b/src/lib/litegraph/src/LGraphCanvas.drawConnections.test.ts @@ -882,6 +882,10 @@ describe('drawConnections hidden links', () => { canvas.setGraph(graph) expect(canvas.dirty_bgcanvas).toBe(true) + const [clientX, clientY] = outputBadgePoint(link) + canvas.processMouseMove( + new PointerEvent('pointermove', { clientX, clientY, isPrimary: false }) + ) canvas.drawConnections(createMockCtx()) expect(isLinkRevealed(scope.rootGraphId, link.id)).toBe(false) @@ -903,6 +907,25 @@ describe('drawConnections hidden links', () => { expect(canvas.dirty_bgcanvas).toBe(true) }) + it('rebuilds badge hit areas after a same-graph reset without a reveal', () => { + const link = createHiddenLink() + canvas.drawConnections(createMockCtx()) + canvas.dirty_bgcanvas = false + + canvas.setGraph(graph) + + expect(canvas.dirty_bgcanvas).toBe(true) + expect( + queryLinkBadgeAtPoint(canvas, ...outputBadgePoint(link)) + ).toBeUndefined() + + canvas.drawConnections(createMockCtx()) + + expect(queryLinkBadgeAtPoint(canvas, ...outputBadgePoint(link))).toBe( + link.id + ) + }) + it('clears slot-owned reveals and badge hit areas when the graph changes', () => { const link = createHiddenLink() canvas.drawConnections(createMockCtx()) diff --git a/src/lib/litegraph/src/LGraphCanvas.ts b/src/lib/litegraph/src/LGraphCanvas.ts index adc92c5aa08..e259e71da42 100644 --- a/src/lib/litegraph/src/LGraphCanvas.ts +++ b/src/lib/litegraph/src/LGraphCanvas.ts @@ -1888,10 +1888,10 @@ export class LGraphCanvas implements CustomEventDispatcher */ setGraph(newGraph: LGraph | Subgraph): void { const { graph } = this - if (graph && clearRootLinkReveals(graphScopeOf(graph).rootGraphId)) - this.dirty_bgcanvas = true - if (newGraph === graph) return + if (graph) clearRootLinkReveals(graphScopeOf(graph).rootGraphId) clearLinkBadgeHitAreas(this) + this.dirty_bgcanvas = true + if (newGraph === graph) return // Drop any in-flight ghost so listeners don't outlive the graph it belongs to if (this.state.ghostNodeId != null) this.finalizeGhostPlacement(true) diff --git a/src/lib/litegraph/src/canvas/linkBadges.test.ts b/src/lib/litegraph/src/canvas/linkBadges.test.ts index 04432625d5c..a9f113716f5 100644 --- a/src/lib/litegraph/src/canvas/linkBadges.test.ts +++ b/src/lib/litegraph/src/canvas/linkBadges.test.ts @@ -200,6 +200,57 @@ describe('link badge frame layout', () => { expect(ctx.fillText).toHaveBeenCalledTimes(2) }) + it.for([ + { + name: 'another node', + originId: 6, + targetId: 7, + startPos: [100, 100], + endPos: [600, 300] + }, + { + name: 'the opposite side of the same node', + originId: 6, + targetId: 4, + startPos: [600, 300], + endPos: [190, 100] + } + ] satisfies { + name: string + originId: number + targetId: number + startPos: Point + endPos: Point + }[])('keeps overlapping badges from $name separately hittable', (other) => { + const host = document.createElement('canvas') + layoutHiddenLinkBadges(host, createContext(), [ + { + link: createLink(1), + presentation: { hidden: true }, + startPos: [100, 100], + endPos: [400, 200], + color: BADGE_COLOR + }, + { + link: new LLink( + toLinkId(2), + 'MODEL', + other.originId, + 0, + other.targetId, + 0 + ), + presentation: { hidden: true }, + startPos: other.startPos, + endPos: other.endPos, + color: BADGE_COLOR + } + ]) + + expect(queryLinkBadgeAtPoint(host, 120, 100)).toBe(toLinkId(1)) + expect(queryLinkBadgeAtPoint(host, 120, 122)).toBe(toLinkId(2)) + }) + it.for([ { name: 'visible', visibleArea: VISIBLE_AREA, paintCount: 2 }, { diff --git a/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.autoPan.test.ts b/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.autoPan.test.ts index 10982e00084..861fc386cf5 100644 --- a/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.autoPan.test.ts +++ b/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.autoPan.test.ts @@ -1,8 +1,27 @@ import { fromPartial } from '@total-typescript/shoehorn' -import { beforeEach, describe, expect, it, vi } from 'vitest' +import { effectScope } from 'vue' +import type { EffectScope } from 'vue' +import { + assert, + beforeEach, + describe, + expect, + it, + onTestFinished, + vi +} from 'vitest' import { tryOnScopeDispose, useEventListener } from '@vueuse/core' import { toNodeId } from '@/types/nodeId' +import { toLinkId } from '@/types/linkId' +import { toOwningGraphId, toRootGraphId } from '@/types/graphScopeId' +import { + clearRootLinkReveals, + isLinkRevealed +} from '@/lib/litegraph/src/canvas/linkRevealState' +import { useLinkStore } from '@/stores/linkStore' +import { useLinkPresentationStore } from '@/stores/linkPresentationStore' +import { useSlotLinkReveal } from './useSlotLinkReveal' const { capturedOnPan, @@ -64,6 +83,7 @@ vi.mock(import('@/scripts/app'), () => ({ canvas: { ds: mockDs, graph: { + id: 'autopan-graph', rootGraph: { id: 'autopan-graph' }, nodes: [], getNodeById: (id: string) => ({ @@ -246,12 +266,17 @@ function pointerEvent( } function startDrag() { - const { onPointerDown } = useSlotLinkInteraction({ - nodeId: toNodeId('node1'), - index: 0, - type: 'output' + const scope = effectScope() + onTestFinished(() => scope.stop()) + scope.run(() => { + const { onPointerDown } = useSlotLinkInteraction({ + nodeId: toNodeId('node1'), + index: 0, + type: 'output' + }) + onPointerDown(pointerEvent(400, 300)) }) - onPointerDown(pointerEvent(400, 300)) + return scope } describe('useSlotLinkInteraction auto-pan', () => { @@ -311,4 +336,59 @@ describe('useSlotLinkInteraction auto-pan', () => { expect(capturedAutoPan.current!.stop).toHaveBeenCalled() }) + + it.for([ + { + name: 'pointerup', + finish: () => capturedHandlers.pointerup(pointerEvent(400, 300)) + }, + { + name: 'pointercancel', + finish: () => capturedHandlers.pointercancel(pointerEvent(400, 300)) + }, + { name: 'scope disposal', finish: (scope: EffectScope) => scope.stop() } + ])( + 'keeps the source link revealed after slot leave until $name', + ({ finish }) => { + const graphScope = { + rootGraphId: toRootGraphId('autopan-graph'), + owningGraphId: toOwningGraphId('autopan-graph') + } + onTestFinished(() => { + clearRootLinkReveals(graphScope.rootGraphId) + }) + const linkId = toLinkId(1) + useLinkStore().registerLink(graphScope, { + id: linkId, + graphId: graphScope.owningGraphId, + originNodeId: toNodeId('node1'), + originSlot: 0, + targetNodeId: toNodeId('node2'), + targetSlot: 0, + type: 'MODEL' + }) + useLinkPresentationStore().patch(graphScope, linkId, { hidden: true }) + const hoverScope = effectScope() + onTestFinished(() => hoverScope.stop()) + const hover = hoverScope.run(() => + useSlotLinkReveal({ + nodeId: toNodeId('node1'), + index: 0, + type: 'output' + }) + ) + assert.exists(hover) + hover.revealLinks() + expect(isLinkRevealed(graphScope.rootGraphId, linkId)).toBe(true) + + const dragScope = startDrag() + hover.unrevealLinks() + + expect(isLinkRevealed(graphScope.rootGraphId, linkId)).toBe(true) + + finish(dragScope) + + expect(isLinkRevealed(graphScope.rootGraphId, linkId)).toBe(false) + } + ) }) diff --git a/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.ts b/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.ts index 7291de146bf..e2d7ee144cd 100644 --- a/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.ts +++ b/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.ts @@ -33,6 +33,7 @@ import { layoutStore } from '@/renderer/core/layout/store/layoutStore' import type { Point } from '@/renderer/core/layout/types' import { toPoint } from '@/renderer/core/layout/utils/geometry' import { createSlotLinkDragContext } from '@/renderer/extensions/vueNodes/composables/slotLinkDragContext' +import { useSlotLinkReveal } from '@/renderer/extensions/vueNodes/composables/useSlotLinkReveal' import { augmentToCanvasPointerEvent } from '@/renderer/extensions/vueNodes/utils/eventUtils' import { app } from '@/scripts/app' import { inputLink } from '@/lib/litegraph/src/node/slotLinks' @@ -158,6 +159,7 @@ export function useSlotLinkInteraction({ // Per-drag drag-state context (non-reactive caches + RAF batching) const dragContext = createSlotLinkDragContext() + const dragReveal = useSlotLinkReveal({ nodeId, index, type }) const resolveRenderLinkSource = (link: RenderLink): Point | null => { if (link.fromReroute) { @@ -339,6 +341,7 @@ export function useSlotLinkInteraction({ activeAdapter = null raf.cancel() dragContext.dispose() + dragReveal.unrevealLinks() clearCompatible() } @@ -764,6 +767,7 @@ export function useSlotLinkInteraction({ ) pointerSession.begin(event.pointerId) + dragReveal.revealLinks() toCanvasPointerEvent(event) updatePointerState(event) From ed120fd854046213a5c7401c166ff52e450fbf90 Mon Sep 17 00:00:00 2001 From: jaeone94 <89377375+jaeone94@users.noreply.github.com> Date: Mon, 28 Sep 2026 09:58:24 +0900 Subject: [PATCH 3/8] fix: preserve link reveals and badge order through interactions --- .../litegraph/src/canvas/linkBadges.test.ts | 82 ++++++++++++++++++- src/lib/litegraph/src/canvas/linkBadges.ts | 11 ++- .../src/canvas/linkRevealState.test.ts | 35 ++++++++ .../litegraph/src/canvas/linkRevealState.ts | 28 +++++-- .../useSlotLinkInteraction.autoPan.test.ts | 53 +++++++++--- .../composables/useSlotLinkInteraction.ts | 2 +- .../vueNodes/composables/useSlotLinkReveal.ts | 3 +- 7 files changed, 190 insertions(+), 24 deletions(-) diff --git a/src/lib/litegraph/src/canvas/linkBadges.test.ts b/src/lib/litegraph/src/canvas/linkBadges.test.ts index a9f113716f5..7cc21d63464 100644 --- a/src/lib/litegraph/src/canvas/linkBadges.test.ts +++ b/src/lib/litegraph/src/canvas/linkBadges.test.ts @@ -1,4 +1,5 @@ -import { describe, expect, it, vi } from 'vitest' +import { fromPartial } from '@total-typescript/shoehorn' +import { assert, describe, expect, it, vi } from 'vitest' import type { Point, ReadOnlyRect } from '@/lib/litegraph/src/interfaces' import { LLink } from '@/lib/litegraph/src/LLink' @@ -177,6 +178,85 @@ describe('link badge frame layout', () => { expect(queryLinkBadgeAtPoint(host, 120, 133)).toBeUndefined() }) + it('keeps non-overlapping badges aligned with their slots', () => { + const host = document.createElement('canvas') + layoutHiddenLinkBadges(host, createContext(), [ + { + link: new LLink(toLinkId(1), 'MODEL', 4, 0, 5, 0), + presentation: { hidden: true }, + startPos: [100, 100], + endPos: [400, 300], + color: BADGE_COLOR + }, + { + link: new LLink(toLinkId(2), 'MODEL', 4, 1, 5, 1), + presentation: { hidden: true }, + startPos: [100, 120], + endPos: [400, 320], + color: BADGE_COLOR + } + ]) + + expect(queryLinkBadgeAtPoint(host, 120, 100)).toBe(toLinkId(1)) + expect(queryLinkBadgeAtPoint(host, 120, 112)).toBe(toLinkId(2)) + expect(queryLinkBadgeAtPoint(host, 340, 312)).toBe(toLinkId(2)) + }) + + it('preserves slot order when a wider upper badge collides with another node', () => { + const host = document.createElement('canvas') + const ctx = createMockCanvasRenderingContext2D({ + measureText: vi.fn((text: string) => + fromPartial({ width: text.length * 6 }) + ) + }) + const layouts = layoutHiddenLinkBadges(host, ctx, [ + { + link: new LLink(toLinkId(3), 'MODEL', 2, 0, 20, 0), + presentation: { hidden: true, label: 'Long upper output' }, + startPos: [34, 100], + endPos: [900, 400], + color: BADGE_COLOR + }, + { + link: new LLink(toLinkId(4), 'MODEL', 2, 1, 21, 0), + presentation: { hidden: true, label: 'X' }, + startPos: [34, 120], + endPos: [900, 500], + color: BADGE_COLOR + }, + { + link: new LLink(toLinkId(1), 'MODEL', 10, 0, 1, 0), + presentation: { hidden: true, label: 'Other input' }, + startPos: [700, -200], + endPos: [200, 100], + color: BADGE_COLOR + }, + { + link: new LLink(toLinkId(2), 'MODEL', 11, 0, 1, 1), + presentation: { hidden: true, label: 'Other input' }, + startPos: [700, -100], + endPos: [200, 120], + color: BADGE_COLOR + } + ]) + const upper = layouts.get(toLinkId(3)) + const lower = layouts.get(toLinkId(4)) + assert.exists(upper) + assert.exists(lower) + + expect(upper.output.tip[1]).toBeGreaterThan(120) + expect(lower.output.hitArea.boundingRect[1]).toBeGreaterThan( + upper.output.hitArea.boundingRect[1] + + upper.output.hitArea.boundingRect[3] + ) + expect(queryLinkBadgeAtPoint(host, 50, upper.output.tip[1])).toBe( + toLinkId(3) + ) + expect(queryLinkBadgeAtPoint(host, 50, lower.output.tip[1])).toBe( + toLinkId(4) + ) + }) + it('culls using reversed and stacked badge extents', () => { const host = document.createElement('canvas') const ctx = createContext() diff --git a/src/lib/litegraph/src/canvas/linkBadges.ts b/src/lib/litegraph/src/canvas/linkBadges.ts index 98541d3d467..5adbd98eaaa 100644 --- a/src/lib/litegraph/src/canvas/linkBadges.ts +++ b/src/lib/litegraph/src/canvas/linkBadges.ts @@ -172,12 +172,19 @@ export function layoutHiddenLinkBadges( endpoints.sort(compareBadgeEndpoints) const hitAreas: BadgeHitArea[] = [] - for (const { hitArea, socket, tip } of endpoints) { + let previousEndpoint: BadgeEndpoint | undefined + for (const endpoint of endpoints) { + const { hitArea, socket, tip, nodeId, side } = endpoint const [left, , width] = hitArea.boundingRect - const centerY = freeBadgeCenterY(hitAreas, left, socket[1], width) + const desiredCenterY = + previousEndpoint?.nodeId === nodeId && previousEndpoint.side === side + ? Math.max(socket[1], previousEndpoint.tip[1]) + : socket[1] + const centerY = freeBadgeCenterY(hitAreas, left, desiredCenterY, width) hitArea.boundingRect[1] = centerY - BADGE_HEIGHT / 2 tip[1] = centerY hitAreas.push(hitArea) + previousEndpoint = endpoint } hitAreasByHost.set(host, hitAreas) return layouts diff --git a/src/lib/litegraph/src/canvas/linkRevealState.test.ts b/src/lib/litegraph/src/canvas/linkRevealState.test.ts index 5c27a9d0a71..6ec95b88fd3 100644 --- a/src/lib/litegraph/src/canvas/linkRevealState.test.ts +++ b/src/lib/litegraph/src/canvas/linkRevealState.test.ts @@ -63,6 +63,41 @@ describe('linkRevealState', () => { expect(isLinkRevealed(ROOT_B, toLinkId(2))).toBe(true) }) + it('keeps a drag revealed while hover moves between owners', () => { + const dragOwner = {} + const previousHover = {} + const currentHover = {} + setRevealedLinks(ROOT_A, [toLinkId(1)], dragOwner, 'drag') + setRevealedLinks(ROOT_A, [toLinkId(2)], previousHover) + setRevealedLinks(ROOT_A, [toLinkId(3)], currentHover) + + expect(isLinkRevealed(ROOT_A, toLinkId(1))).toBe(true) + expect(isLinkRevealed(ROOT_A, toLinkId(2))).toBe(false) + expect(isLinkRevealed(ROOT_A, toLinkId(3))).toBe(true) + expect(clearRevealedLinks(previousHover)).toBe(false) + + clearRevealedLinks(currentHover) + + expect(isLinkRevealed(ROOT_A, toLinkId(1))).toBe(true) + expect(isLinkRevealed(ROOT_A, toLinkId(3))).toBe(false) + + clearRevealedLinks(dragOwner) + + expect(isLinkRevealed(ROOT_A, toLinkId(1))).toBe(false) + }) + + it('clears hover and drag on a graph reset without affecting other roots', () => { + setRevealedLinks(ROOT_A, [toLinkId(1)], {}) + setRevealedLinks(ROOT_A, [toLinkId(2)], {}, 'drag') + setRevealedLinks(ROOT_B, [toLinkId(1)], {}, 'drag') + + expect(clearRootLinkReveals(ROOT_A)).toBe(true) + expect(isLinkRevealed(ROOT_A, toLinkId(1))).toBe(false) + expect(isLinkRevealed(ROOT_A, toLinkId(2))).toBe(false) + expect(isLinkRevealed(ROOT_B, toLinkId(1))).toBe(true) + expect(clearRootLinkReveals(ROOT_A)).toBe(false) + }) + it('ignores a stale owner clearing a newer reveal', () => { const previousOwner = {} const currentOwner = {} diff --git a/src/lib/litegraph/src/canvas/linkRevealState.ts b/src/lib/litegraph/src/canvas/linkRevealState.ts index 5c028b68e69..ff4f5b6fa21 100644 --- a/src/lib/litegraph/src/canvas/linkRevealState.ts +++ b/src/lib/litegraph/src/canvas/linkRevealState.ts @@ -6,7 +6,10 @@ interface ActiveReveal { linkIds: ReadonlySet } -const revealsByRoot = new Map() +const revealsBySource = { + hover: new Map(), + drag: new Map() +} function setsEqual(first: ReadonlySet, second: ReadonlySet) { return ( @@ -18,11 +21,13 @@ function setsEqual(first: ReadonlySet, second: ReadonlySet) { export function setRevealedLinks( rootGraphId: RootGraphId, linkIds: Iterable, - owner: object + owner: object, + source: 'hover' | 'drag' = 'hover' ): boolean { const next = new Set(linkIds) if (next.size === 0) return clearRevealedLinks(owner) + const revealsByRoot = revealsBySource[source] const previous = revealsByRoot.get(rootGraphId) revealsByRoot.set(rootGraphId, { owner, linkIds: next }) return !previous || !setsEqual(previous.linkIds, next) @@ -30,21 +35,28 @@ export function setRevealedLinks( export function clearRevealedLinks(owner: object): boolean { let changed = false - for (const [rootGraphId, reveal] of revealsByRoot) { - if (reveal.owner !== owner) continue - revealsByRoot.delete(rootGraphId) - changed = true + for (const revealsByRoot of Object.values(revealsBySource)) { + for (const [rootGraphId, reveal] of revealsByRoot) { + if (reveal.owner !== owner) continue + revealsByRoot.delete(rootGraphId) + changed = true + } } return changed } export function clearRootLinkReveals(rootGraphId: RootGraphId): boolean { - return revealsByRoot.delete(rootGraphId) + const hoverCleared = revealsBySource.hover.delete(rootGraphId) + const dragCleared = revealsBySource.drag.delete(rootGraphId) + return hoverCleared || dragCleared } export function isLinkRevealed( rootGraphId: RootGraphId, linkId: LinkId ): boolean { - return revealsByRoot.get(rootGraphId)?.linkIds.has(linkId) ?? false + return ( + revealsBySource.hover.get(rootGraphId)?.linkIds.has(linkId) === true || + revealsBySource.drag.get(rootGraphId)?.linkIds.has(linkId) === true + ) } diff --git a/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.autoPan.test.ts b/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.autoPan.test.ts index 8731e8b101e..aa3f74c39df 100644 --- a/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.autoPan.test.ts +++ b/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.autoPan.test.ts @@ -10,7 +10,7 @@ import { onTestFinished, vi } from 'vitest' -import { tryOnScopeDispose, useEventListener } from '@vueuse/core' +import { useEventListener } from '@vueuse/core' import { toNodeId } from '@/types/nodeId' import { toLinkId } from '@/types/linkId' @@ -223,7 +223,6 @@ vi.mocked(useEventListener).mockImplementation((event, handler) => { } return vi.fn() }) -vi.mocked(tryOnScopeDispose).mockImplementation(() => true) vi.mock(import('@/lib/litegraph/src/LLink'), () => ({ LLink: { getReroutes: () => [] }, @@ -282,7 +281,6 @@ describe('useSlotLinkInteraction auto-pan', () => { } return vi.fn() }) - vi.mocked(tryOnScopeDispose).mockImplementation(() => true) capturedOnPan.current = null capturedAutoPan.current = null for (const k of Object.keys(capturedHandlers)) { @@ -334,17 +332,45 @@ describe('useSlotLinkInteraction auto-pan', () => { it.for([ { - name: 'pointerup', - finish: () => capturedHandlers.pointerup(pointerEvent(400, 300)) + name: 'pointerup after leaving the slot', + moveHover: (hover: ReturnType) => + hover.unrevealLinks(), + finish: () => capturedHandlers.pointerup(pointerEvent(400, 300)), + remainsRevealed: false }, { - name: 'pointercancel', - finish: () => capturedHandlers.pointercancel(pointerEvent(400, 300)) + name: 'pointercancel after leaving the slot', + moveHover: (hover: ReturnType) => + hover.unrevealLinks(), + finish: () => capturedHandlers.pointercancel(pointerEvent(400, 300)), + remainsRevealed: false }, - { name: 'scope disposal', finish: (scope: EffectScope) => scope.stop() } + { + name: 'scope disposal after leaving the slot', + moveHover: (hover: ReturnType) => + hover.unrevealLinks(), + finish: (scope: EffectScope) => scope.stop(), + remainsRevealed: false + }, + { + name: 'pointerup while still hovering the slot', + moveHover: () => {}, + finish: () => capturedHandlers.pointerup(pointerEvent(400, 300)), + remainsRevealed: true + }, + { + name: 'pointerup after re-entering and leaving the slot', + moveHover: (hover: ReturnType) => { + hover.unrevealLinks() + hover.revealLinks() + hover.unrevealLinks() + }, + finish: () => capturedHandlers.pointerup(pointerEvent(400, 300)), + remainsRevealed: false + } ])( - 'keeps the source link revealed after slot leave until $name', - ({ finish }) => { + 'preserves drag and hover reveals through $name', + ({ moveHover, finish, remainsRevealed }) => { const graphScope = { rootGraphId: toRootGraphId('autopan-graph'), owningGraphId: toOwningGraphId('autopan-graph') @@ -377,12 +403,17 @@ describe('useSlotLinkInteraction auto-pan', () => { expect(isLinkRevealed(graphScope.rootGraphId, linkId)).toBe(true) const dragScope = startDrag() - hover.unrevealLinks() + moveHover(hover) expect(isLinkRevealed(graphScope.rootGraphId, linkId)).toBe(true) finish(dragScope) + expect(isLinkRevealed(graphScope.rootGraphId, linkId)).toBe( + remainsRevealed + ) + + hover.unrevealLinks() expect(isLinkRevealed(graphScope.rootGraphId, linkId)).toBe(false) } ) diff --git a/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.ts b/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.ts index 2c5b4643d8b..82db76348d6 100644 --- a/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.ts +++ b/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.ts @@ -160,7 +160,7 @@ export function useSlotLinkInteraction({ // Per-drag drag-state context (non-reactive caches + RAF batching) const dragContext = createSlotLinkDragContext() - const dragReveal = useSlotLinkReveal({ nodeId, index, type }) + const dragReveal = useSlotLinkReveal({ nodeId, index, type, source: 'drag' }) const resolveRenderLinkSource = (link: RenderLink): Point | null => { if (link.fromReroute) { diff --git a/src/renderer/extensions/vueNodes/composables/useSlotLinkReveal.ts b/src/renderer/extensions/vueNodes/composables/useSlotLinkReveal.ts index 5de1888e1e2..7fbff8a5ee2 100644 --- a/src/renderer/extensions/vueNodes/composables/useSlotLinkReveal.ts +++ b/src/renderer/extensions/vueNodes/composables/useSlotLinkReveal.ts @@ -14,6 +14,7 @@ interface SlotLinkRevealOptions { nodeId?: NodeId index: number type: 'input' | 'output' + source?: 'hover' | 'drag' } export function useSlotLinkReveal(options: SlotLinkRevealOptions) { @@ -41,7 +42,7 @@ export function useSlotLinkReveal(options: SlotLinkRevealOptions) { ? [link.id] : [] ) - if (setRevealedLinks(scope.rootGraphId, linkIds, owner)) { + if (setRevealedLinks(scope.rootGraphId, linkIds, owner, options.source)) { app.canvas.setDirty(false, true) } } From 4aa3d7a0027eff250ac10987c3f360c4885a3dc7 Mon Sep 17 00:00:00 2001 From: jaeone94 Date: Thu, 1 Oct 2026 09:03:22 +0900 Subject: [PATCH 4/8] fix: scope hidden-link badge PR to slot ordering and hitboxes --- .../litegraph/src/canvas/linkBadges.test.ts | 50 +++++++ .../src/canvas/linkRevealState.test.ts | 35 ----- .../litegraph/src/canvas/linkRevealState.ts | 28 ++-- .../useSlotLinkInteraction.autoPan.test.ts | 129 ++---------------- .../composables/useSlotLinkInteraction.ts | 4 - .../vueNodes/composables/useSlotLinkReveal.ts | 3 +- 6 files changed, 68 insertions(+), 181 deletions(-) diff --git a/src/lib/litegraph/src/canvas/linkBadges.test.ts b/src/lib/litegraph/src/canvas/linkBadges.test.ts index 7cc21d63464..5cc8d1de993 100644 --- a/src/lib/litegraph/src/canvas/linkBadges.test.ts +++ b/src/lib/litegraph/src/canvas/linkBadges.test.ts @@ -386,3 +386,53 @@ describe('link badge frame layout', () => { expect(queryLinkBadgeAtPoint(host, 176, 110)).toBeUndefined() }) }) + +describe('badge ordering tie breakers', () => { + it('places output before input even when the input is supplied first', () => { + const host = {} + const layouts = layoutHiddenLinkBadges(host, createContext(), [ + { + link: new LLink(toLinkId(1), 'MODEL', 6, 0, 4, 0), + presentation: { hidden: true }, + startPos: [600, 300], + endPos: [190, 100], + color: BADGE_COLOR + }, + { + link: new LLink(toLinkId(2), 'MODEL', 4, 0, 5, 0), + presentation: { hidden: true }, + startPos: [100, 100], + endPos: [400, 200], + color: BADGE_COLOR + } + ]) + expect(layouts.get(toLinkId(2))?.output.tip[1]).toBe(100) + expect(layouts.get(toLinkId(1))?.input.tip[1]).toBe(122) + expect(queryLinkBadgeAtPoint(host, 120, 100)).toBe(toLinkId(2)) + expect(queryLinkBadgeAtPoint(host, 120, 122)).toBe(toLinkId(1)) + }) + + it('uses slot order before link ID and insertion order at equal socket Y', () => { + const host = {} + const layouts = layoutHiddenLinkBadges(host, createContext(), [ + { + link: new LLink(toLinkId(1), 'MODEL', 4, 3, 5, 0), + presentation: { hidden: true }, + startPos: [100, 100], + endPos: [400, 200], + color: BADGE_COLOR + }, + { + link: new LLink(toLinkId(2), 'MODEL', 4, 1, 6, 0), + presentation: { hidden: true }, + startPos: [100, 100], + endPos: [600, 300], + color: BADGE_COLOR + } + ]) + expect(layouts.get(toLinkId(2))?.output.tip[1]).toBe(100) + expect(layouts.get(toLinkId(1))?.output.tip[1]).toBe(122) + expect(queryLinkBadgeAtPoint(host, 120, 100)).toBe(toLinkId(2)) + expect(queryLinkBadgeAtPoint(host, 120, 122)).toBe(toLinkId(1)) + }) +}) diff --git a/src/lib/litegraph/src/canvas/linkRevealState.test.ts b/src/lib/litegraph/src/canvas/linkRevealState.test.ts index 6ec95b88fd3..5c27a9d0a71 100644 --- a/src/lib/litegraph/src/canvas/linkRevealState.test.ts +++ b/src/lib/litegraph/src/canvas/linkRevealState.test.ts @@ -63,41 +63,6 @@ describe('linkRevealState', () => { expect(isLinkRevealed(ROOT_B, toLinkId(2))).toBe(true) }) - it('keeps a drag revealed while hover moves between owners', () => { - const dragOwner = {} - const previousHover = {} - const currentHover = {} - setRevealedLinks(ROOT_A, [toLinkId(1)], dragOwner, 'drag') - setRevealedLinks(ROOT_A, [toLinkId(2)], previousHover) - setRevealedLinks(ROOT_A, [toLinkId(3)], currentHover) - - expect(isLinkRevealed(ROOT_A, toLinkId(1))).toBe(true) - expect(isLinkRevealed(ROOT_A, toLinkId(2))).toBe(false) - expect(isLinkRevealed(ROOT_A, toLinkId(3))).toBe(true) - expect(clearRevealedLinks(previousHover)).toBe(false) - - clearRevealedLinks(currentHover) - - expect(isLinkRevealed(ROOT_A, toLinkId(1))).toBe(true) - expect(isLinkRevealed(ROOT_A, toLinkId(3))).toBe(false) - - clearRevealedLinks(dragOwner) - - expect(isLinkRevealed(ROOT_A, toLinkId(1))).toBe(false) - }) - - it('clears hover and drag on a graph reset without affecting other roots', () => { - setRevealedLinks(ROOT_A, [toLinkId(1)], {}) - setRevealedLinks(ROOT_A, [toLinkId(2)], {}, 'drag') - setRevealedLinks(ROOT_B, [toLinkId(1)], {}, 'drag') - - expect(clearRootLinkReveals(ROOT_A)).toBe(true) - expect(isLinkRevealed(ROOT_A, toLinkId(1))).toBe(false) - expect(isLinkRevealed(ROOT_A, toLinkId(2))).toBe(false) - expect(isLinkRevealed(ROOT_B, toLinkId(1))).toBe(true) - expect(clearRootLinkReveals(ROOT_A)).toBe(false) - }) - it('ignores a stale owner clearing a newer reveal', () => { const previousOwner = {} const currentOwner = {} diff --git a/src/lib/litegraph/src/canvas/linkRevealState.ts b/src/lib/litegraph/src/canvas/linkRevealState.ts index ff4f5b6fa21..5c028b68e69 100644 --- a/src/lib/litegraph/src/canvas/linkRevealState.ts +++ b/src/lib/litegraph/src/canvas/linkRevealState.ts @@ -6,10 +6,7 @@ interface ActiveReveal { linkIds: ReadonlySet } -const revealsBySource = { - hover: new Map(), - drag: new Map() -} +const revealsByRoot = new Map() function setsEqual(first: ReadonlySet, second: ReadonlySet) { return ( @@ -21,13 +18,11 @@ function setsEqual(first: ReadonlySet, second: ReadonlySet) { export function setRevealedLinks( rootGraphId: RootGraphId, linkIds: Iterable, - owner: object, - source: 'hover' | 'drag' = 'hover' + owner: object ): boolean { const next = new Set(linkIds) if (next.size === 0) return clearRevealedLinks(owner) - const revealsByRoot = revealsBySource[source] const previous = revealsByRoot.get(rootGraphId) revealsByRoot.set(rootGraphId, { owner, linkIds: next }) return !previous || !setsEqual(previous.linkIds, next) @@ -35,28 +30,21 @@ export function setRevealedLinks( export function clearRevealedLinks(owner: object): boolean { let changed = false - for (const revealsByRoot of Object.values(revealsBySource)) { - for (const [rootGraphId, reveal] of revealsByRoot) { - if (reveal.owner !== owner) continue - revealsByRoot.delete(rootGraphId) - changed = true - } + for (const [rootGraphId, reveal] of revealsByRoot) { + if (reveal.owner !== owner) continue + revealsByRoot.delete(rootGraphId) + changed = true } return changed } export function clearRootLinkReveals(rootGraphId: RootGraphId): boolean { - const hoverCleared = revealsBySource.hover.delete(rootGraphId) - const dragCleared = revealsBySource.drag.delete(rootGraphId) - return hoverCleared || dragCleared + return revealsByRoot.delete(rootGraphId) } export function isLinkRevealed( rootGraphId: RootGraphId, linkId: LinkId ): boolean { - return ( - revealsBySource.hover.get(rootGraphId)?.linkIds.has(linkId) === true || - revealsBySource.drag.get(rootGraphId)?.linkIds.has(linkId) === true - ) + return revealsByRoot.get(rootGraphId)?.linkIds.has(linkId) ?? false } diff --git a/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.autoPan.test.ts b/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.autoPan.test.ts index aa3f74c39df..b7a0001b8ef 100644 --- a/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.autoPan.test.ts +++ b/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.autoPan.test.ts @@ -1,27 +1,8 @@ import { fromPartial } from '@total-typescript/shoehorn' -import { effectScope } from 'vue' -import type { EffectScope } from 'vue' -import { - assert, - beforeEach, - describe, - expect, - it, - onTestFinished, - vi -} from 'vitest' -import { useEventListener } from '@vueuse/core' +import { beforeEach, describe, expect, it, vi } from 'vitest' +import { tryOnScopeDispose, useEventListener } from '@vueuse/core' import { toNodeId } from '@/types/nodeId' -import { toLinkId } from '@/types/linkId' -import { toOwningGraphId, toRootGraphId } from '@/types/graphScopeId' -import { - clearRootLinkReveals, - isLinkRevealed -} from '@/lib/litegraph/src/canvas/linkRevealState' -import { useLinkStore } from '@/stores/linkStore' -import { useLinkPresentationStore } from '@/stores/linkPresentationStore' -import { useSlotLinkReveal } from './useSlotLinkReveal' const { capturedOnPan, @@ -83,7 +64,6 @@ vi.mock(import('@/scripts/app'), () => ({ canvas: { ds: mockDs, graph: { - id: 'autopan-graph', rootGraph: { id: 'autopan-graph' }, nodes: [], getNodeById: (id: string) => ({ @@ -223,6 +203,7 @@ vi.mocked(useEventListener).mockImplementation((event, handler) => { } return vi.fn() }) +vi.mocked(tryOnScopeDispose).mockImplementation(() => true) vi.mock(import('@/lib/litegraph/src/LLink'), () => ({ LLink: { getReroutes: () => [] }, @@ -260,17 +241,12 @@ function pointerEvent( } function startDrag() { - const scope = effectScope() - onTestFinished(() => scope.stop()) - scope.run(() => { - const { onPointerDown } = useSlotLinkInteraction({ - nodeId: toNodeId('node1'), - index: 0, - type: 'output' - }) - onPointerDown(pointerEvent(400, 300)) + const { onPointerDown } = useSlotLinkInteraction({ + nodeId: toNodeId('node1'), + index: 0, + type: 'output' }) - return scope + onPointerDown(pointerEvent(400, 300)) } describe('useSlotLinkInteraction auto-pan', () => { @@ -281,6 +257,7 @@ describe('useSlotLinkInteraction auto-pan', () => { } return vi.fn() }) + vi.mocked(tryOnScopeDispose).mockImplementation(() => true) capturedOnPan.current = null capturedAutoPan.current = null for (const k of Object.keys(capturedHandlers)) { @@ -329,92 +306,4 @@ describe('useSlotLinkInteraction auto-pan', () => { expect(capturedAutoPan.current!.stop).toHaveBeenCalled() }) - - it.for([ - { - name: 'pointerup after leaving the slot', - moveHover: (hover: ReturnType) => - hover.unrevealLinks(), - finish: () => capturedHandlers.pointerup(pointerEvent(400, 300)), - remainsRevealed: false - }, - { - name: 'pointercancel after leaving the slot', - moveHover: (hover: ReturnType) => - hover.unrevealLinks(), - finish: () => capturedHandlers.pointercancel(pointerEvent(400, 300)), - remainsRevealed: false - }, - { - name: 'scope disposal after leaving the slot', - moveHover: (hover: ReturnType) => - hover.unrevealLinks(), - finish: (scope: EffectScope) => scope.stop(), - remainsRevealed: false - }, - { - name: 'pointerup while still hovering the slot', - moveHover: () => {}, - finish: () => capturedHandlers.pointerup(pointerEvent(400, 300)), - remainsRevealed: true - }, - { - name: 'pointerup after re-entering and leaving the slot', - moveHover: (hover: ReturnType) => { - hover.unrevealLinks() - hover.revealLinks() - hover.unrevealLinks() - }, - finish: () => capturedHandlers.pointerup(pointerEvent(400, 300)), - remainsRevealed: false - } - ])( - 'preserves drag and hover reveals through $name', - ({ moveHover, finish, remainsRevealed }) => { - const graphScope = { - rootGraphId: toRootGraphId('autopan-graph'), - owningGraphId: toOwningGraphId('autopan-graph') - } - onTestFinished(() => { - clearRootLinkReveals(graphScope.rootGraphId) - }) - const linkId = toLinkId(1) - useLinkStore().registerLink(graphScope, { - id: linkId, - graphId: graphScope.owningGraphId, - originNodeId: toNodeId('node1'), - originSlot: 0, - targetNodeId: toNodeId('node2'), - targetSlot: 0, - type: 'MODEL' - }) - useLinkPresentationStore().patch(graphScope, linkId, { hidden: true }) - const hoverScope = effectScope() - onTestFinished(() => hoverScope.stop()) - const hover = hoverScope.run(() => - useSlotLinkReveal({ - nodeId: toNodeId('node1'), - index: 0, - type: 'output' - }) - ) - assert.exists(hover) - hover.revealLinks() - expect(isLinkRevealed(graphScope.rootGraphId, linkId)).toBe(true) - - const dragScope = startDrag() - moveHover(hover) - - expect(isLinkRevealed(graphScope.rootGraphId, linkId)).toBe(true) - - finish(dragScope) - - expect(isLinkRevealed(graphScope.rootGraphId, linkId)).toBe( - remainsRevealed - ) - - hover.unrevealLinks() - expect(isLinkRevealed(graphScope.rootGraphId, linkId)).toBe(false) - } - ) }) diff --git a/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.ts b/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.ts index 82db76348d6..1935d9df78a 100644 --- a/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.ts +++ b/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.ts @@ -34,7 +34,6 @@ import { layoutStore } from '@/renderer/core/layout/store/layoutStore' import type { Point } from '@/renderer/core/layout/types' import { toPoint } from '@/renderer/core/layout/utils/geometry' import { createSlotLinkDragContext } from '@/renderer/extensions/vueNodes/composables/slotLinkDragContext' -import { useSlotLinkReveal } from '@/renderer/extensions/vueNodes/composables/useSlotLinkReveal' import { augmentToCanvasPointerEvent } from '@/renderer/extensions/vueNodes/utils/eventUtils' import { app } from '@/scripts/app' import { inputLink } from '@/lib/litegraph/src/node/slotLinks' @@ -160,7 +159,6 @@ export function useSlotLinkInteraction({ // Per-drag drag-state context (non-reactive caches + RAF batching) const dragContext = createSlotLinkDragContext() - const dragReveal = useSlotLinkReveal({ nodeId, index, type, source: 'drag' }) const resolveRenderLinkSource = (link: RenderLink): Point | null => { if (link.fromReroute) { @@ -342,7 +340,6 @@ export function useSlotLinkInteraction({ activeAdapter = null raf.cancel() dragContext.dispose() - dragReveal.unrevealLinks() clearCompatible() } @@ -769,7 +766,6 @@ export function useSlotLinkInteraction({ ) pointerSession.begin(event.pointerId) - dragReveal.revealLinks() toCanvasPointerEvent(event) updatePointerState(event) diff --git a/src/renderer/extensions/vueNodes/composables/useSlotLinkReveal.ts b/src/renderer/extensions/vueNodes/composables/useSlotLinkReveal.ts index 7fbff8a5ee2..5de1888e1e2 100644 --- a/src/renderer/extensions/vueNodes/composables/useSlotLinkReveal.ts +++ b/src/renderer/extensions/vueNodes/composables/useSlotLinkReveal.ts @@ -14,7 +14,6 @@ interface SlotLinkRevealOptions { nodeId?: NodeId index: number type: 'input' | 'output' - source?: 'hover' | 'drag' } export function useSlotLinkReveal(options: SlotLinkRevealOptions) { @@ -42,7 +41,7 @@ export function useSlotLinkReveal(options: SlotLinkRevealOptions) { ? [link.id] : [] ) - if (setRevealedLinks(scope.rootGraphId, linkIds, owner, options.source)) { + if (setRevealedLinks(scope.rootGraphId, linkIds, owner)) { app.canvas.setDirty(false, true) } } From 3c338566a5b05c217d836448f0d9f34472aeb31a Mon Sep 17 00:00:00 2001 From: jaeone94 Date: Thu, 1 Oct 2026 09:27:10 +0900 Subject: [PATCH 5/8] fix: provide lint CI script for current PR workflow --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 780fa6146ed..083a7869c4d 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "knip:no-cache": "knip", "knip": "knip --cache", "lint:fix:no-cache": "pnpm oxlint:repo --fix && pnpm oxlint:audit && eslint --concurrency auto --fix", + "lint:fix:ci": "pnpm lint:fix --cache-strategy content", "lint:fix": "pnpm oxlint:repo --fix && pnpm oxlint:audit && eslint --cache --cache-strategy content --concurrency auto --fix", "lint:no-cache": "pnpm exec stylelint '{apps,packages,src}/**/*.{css,vue}' && pnpm oxlint && eslint --concurrency auto", "lint:unstaged:fix": "tsx scripts/lint-unstaged.ts --fix", From 828d52dad568f6f2a0f1768c8d7b5d217c6272fd Mon Sep 17 00:00:00 2001 From: jaeone94 Date: Thu, 1 Oct 2026 09:29:42 +0900 Subject: [PATCH 6/8] fix: align lint cache script with main --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 083a7869c4d..d4a62c3af21 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "knip": "knip --cache", "lint:fix:no-cache": "pnpm oxlint:repo --fix && pnpm oxlint:audit && eslint --concurrency auto --fix", "lint:fix:ci": "pnpm lint:fix --cache-strategy content", - "lint:fix": "pnpm oxlint:repo --fix && pnpm oxlint:audit && eslint --cache --cache-strategy content --concurrency auto --fix", + "lint:fix": "pnpm oxlint:repo --fix && pnpm oxlint:audit && eslint --cache --concurrency auto --fix", "lint:no-cache": "pnpm exec stylelint '{apps,packages,src}/**/*.{css,vue}' && pnpm oxlint && eslint --concurrency auto", "lint:unstaged:fix": "tsx scripts/lint-unstaged.ts --fix", "lint:unstaged": "tsx scripts/lint-unstaged.ts", From ea13ff50d9a7c74ed7baf7ed209d35c4cb3048f3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Oct 2026 00:32:49 +0000 Subject: [PATCH 7/8] fix: repair pnpm lockfile --- pnpm-lock.yaml | 119 ++++++++++--------------------------------------- 1 file changed, 23 insertions(+), 96 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dc8d222b738..becc4a8c930 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -598,7 +598,7 @@ importers: version: 14.4.0(vue@3.5.42(typescript@6.0.3)) '@vueuse/integrations': specifier: 'catalog:' - version: 14.4.0(axios@1.18.1(debug@4.4.3))(fuse.js@7.0.0)(vue@3.5.42(typescript@6.0.3)) + version: 14.4.0(axios@1.18.1)(fuse.js@7.0.0)(vue@3.5.42(typescript@6.0.3)) '@vueuse/router': specifier: ^14.4.0 version: 14.4.0(vue-router@5.2.0(@vue/compiler-sfc@3.5.42)(esbuild@0.28.1)(pinia@4.0.2(@vue/devtools-api@8.1.5)(typescript@6.0.3)(vue@3.5.42(typescript@6.0.3)))(rolldown@1.2.6)(vite@8.2.2(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.49.0)(tsx@4.23.1)(yaml@2.9.0))(vue@3.5.42(typescript@6.0.3)))(vue@3.5.42(typescript@6.0.3)) @@ -755,7 +755,7 @@ importers: version: 14.6.1(@testing-library/dom@10.4.1) '@testing-library/vue': specifier: 'catalog:' - version: 8.1.0(@vue/compiler-dom@3.5.42)(@vue/compiler-sfc@3.5.41)(@vue/server-renderer@3.5.42)(vue@3.5.42(typescript@6.0.3)) + version: 8.1.0(@vue/compiler-dom@3.5.42)(@vue/compiler-sfc@3.5.42)(@vue/server-renderer@3.5.42)(vue@3.5.42(typescript@6.0.3)) '@total-typescript/shoehorn': specifier: 'catalog:' version: 0.1.2 @@ -1174,7 +1174,7 @@ importers: version: 14.6.1(@testing-library/dom@10.4.1) '@testing-library/vue': specifier: 'catalog:' - version: 8.1.0(@vue/compiler-dom@3.5.42)(@vue/compiler-sfc@3.5.41)(@vue/server-renderer@3.5.42)(vue@3.5.42(typescript@6.0.3)) + version: 8.1.0(@vue/compiler-dom@3.5.42)(@vue/compiler-sfc@3.5.42)(@vue/server-renderer@3.5.42)(vue@3.5.42(typescript@6.0.3)) '@total-typescript/shoehorn': specifier: 'catalog:' version: 0.1.2 @@ -5172,27 +5172,15 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@vue/compiler-core@3.5.41': - resolution: {integrity: sha512-q0Xtv/F9w2YO/7htQhtiL+Ev2WCJbe5N2hc+XfgyKkEKqWpSxknmT8QOuGdEKNdjPq0c3F7rNpFkTo3Kfrm7pg==} - '@vue/compiler-core@3.5.42': resolution: {integrity: sha512-2Ye1ilMtKXxl8qZUrQ5j0CdgenFp/HFQmta6rfRyfEsTG69L6Wk+tWuNoHYHMx9E8tF2Slvdg1FuwDvAXdy1LQ==} - '@vue/compiler-dom@3.5.41': - resolution: {integrity: sha512-oKacVfNglLvGjnS6BXOlGL7EyG2h8X03pqXCjzotRZUaXGjbrTJUnVAQjrCqUnS+lyu31nwQjZY/d817GmCnfw==} - '@vue/compiler-dom@3.5.42': resolution: {integrity: sha512-qbhQZEFmycr+ni/qyuccS4sucNN7VAbDfbkvNxWOX2VfgFm90MNs3/UhRNKoPMEIVn0F8gdlYjLPvqxHwHeQOA==} - '@vue/compiler-sfc@3.5.41': - resolution: {integrity: sha512-XJhip7R2wy6vX3knCxdZN4KracFaZUef58s1KYewqluedHIJaPIVfXoYT7MF1F8nCvv6k8bWWxDC8opMkg1VTQ==} - '@vue/compiler-sfc@3.5.42': resolution: {integrity: sha512-fkCAFB4okcAANGMThboWnScp/gzWjU0ZSkVnjTIiplmMDq2uq0tIB3j+xVu4rhv5rvOgBySCysudmbMd6xRRqw==} - '@vue/compiler-ssr@3.5.41': - resolution: {integrity: sha512-U3v5OejKEGqOI0Wy0+Sz7hGuIFZHA4LSXzrNM3IMIeDyJEBBfTpX26n3SDgToRpP2bLc9FfI2j/kSgcJ8Emq5A==} - '@vue/compiler-ssr@3.5.42': resolution: {integrity: sha512-xmLk3wLkbizPAiLyomjgFFosf2ys9b5Ghb+oh/k2tnvipNz8OFrQOiTcWCzyK7MpBp9KkyGtfvgfLUivbmuGYA==} @@ -5240,9 +5228,6 @@ packages: '@vue/server-renderer@3.5.42': resolution: {integrity: sha512-2++5dUyYS4gvo7xQXSECUDhB7TS0aOl5SeVfC5qSq1Jgfhjvegw1zqhwTIR3imZ+QYPJQw9gfcFvXGAjGZ7ajQ==} - '@vue/shared@3.5.41': - resolution: {integrity: sha512-IOnwSCma8j+9xJT6b8H0dEYidC80NsYmNMlZxRsukYcSoGaDBohog5hDxzeUXdFeGWFA++vWvxqOmrr96VlqMA==} - '@vue/shared@3.5.42': resolution: {integrity: sha512-2rPxex1jQf4jvl9MOHl6YaXCPcrNqz/FstMOEh3QWY+/OME9nQTvl9WYeCwhW7AFjaR0SnngZGlp/wkR6rkI6g==} @@ -7454,9 +7439,6 @@ packages: magic-string@1.1.1: resolution: {integrity: sha512-qFemKPzc3ttrYVaMmnSkGtGc5nE6Ncl4bj7c9IE6C9OUIRXjf6PzJ+UZ1xhVIjYc7dolHq3qKzpAJPZUbvNj+A==} - magicast@0.5.3: - resolution: {integrity: sha512-pVKE4UdSQ7DvHzivsCIFx2BJn1mHG6KsyrFcaxFx6tONdneEuThrDx0Cj3AMg58KyN4pzYT+LHOotxDQDjNvkw==} - magicast@0.5.4: resolution: {integrity: sha512-llBEhWm1SacoRwgHUoQJYtwp4PBLF4faQi5TCpIGyGs9n4y5+juI0tDgyKIfpqxckRHaHzouUEph3THklWh03w==} @@ -9635,9 +9617,6 @@ packages: vscode-nls@5.2.0: resolution: {integrity: sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==} - vscode-uri@3.1.0: - resolution: {integrity: sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==} - vscode-uri@3.2.0: resolution: {integrity: sha512-m2gXo3bn0G1kT9InzMf07fTbqMbGtyckj3bH5ktLO+1Ssv+yiATZ4dhwaQv9UZWxJh6E9IFGnQyjgWVDWVBDrg==} @@ -10220,7 +10199,7 @@ snapshots: volar-service-typescript-twoslash-queries: 0.0.71(@volar/language-service@2.4.28) volar-service-yaml: 0.0.71(@volar/language-service@2.4.28) vscode-html-languageservice: 5.6.2 - vscode-uri: 3.1.0 + vscode-uri: 3.2.0 optionalDependencies: prettier: 3.9.5 prettier-plugin-astro: 1.0.0(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)(prettier@3.9.5) @@ -10300,7 +10279,7 @@ snapshots: dependencies: '@vitejs/plugin-vue': 6.0.8(vite@8.2.2(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.49.0)(tsx@4.23.1)(yaml@2.9.0))(vue@3.5.42(typescript@6.0.3)) '@vitejs/plugin-vue-jsx': 5.1.6(vite@8.2.2(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.49.0)(tsx@4.23.1)(yaml@2.9.0))(vue@3.5.42(typescript@6.0.3)) - '@vue/compiler-sfc': 3.5.41 + '@vue/compiler-sfc': 3.5.42 astro: 7.2.1(@astrojs/markdown-remark@7.2.2)(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)(@types/node@25.9.5)(jiti@2.7.0)(terser@5.49.0)(tsx@4.23.1)(yaml@2.9.0) vite: 8.2.2(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.49.0)(tsx@4.23.1)(yaml@2.9.0) vite-plugin-vue-devtools: 8.2.1(vite@8.2.2(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.49.0)(tsx@4.23.1)(yaml@2.9.0))(vue@3.5.42(typescript@6.0.3)) @@ -12773,18 +12752,6 @@ snapshots: dependencies: '@testing-library/dom': 10.4.1 - '@testing-library/vue@8.1.0(@vue/compiler-dom@3.5.42)(@vue/compiler-sfc@3.5.41)(@vue/server-renderer@3.5.42)(vue@3.5.42(typescript@6.0.3))': - dependencies: - '@babel/runtime': 7.29.7 - '@testing-library/dom': 9.3.4 - '@vue/test-utils': 2.4.11(@vue/compiler-dom@3.5.42)(@vue/server-renderer@3.5.42)(vue@3.5.42(typescript@6.0.3)) - vue: 3.5.42(typescript@6.0.3) - optionalDependencies: - '@vue/compiler-sfc': 3.5.41 - transitivePeerDependencies: - - '@vue/compiler-dom' - - '@vue/server-renderer' - '@testing-library/vue@8.1.0(@vue/compiler-dom@3.5.42)(@vue/compiler-sfc@3.5.42)(@vue/server-renderer@3.5.42)(vue@3.5.42(typescript@6.0.3))': dependencies: '@babel/runtime': 7.29.7 @@ -13474,7 +13441,7 @@ snapshots: typesafe-path: 0.2.2 typescript: 6.0.3 vscode-languageserver-textdocument: 1.0.12 - vscode-uri: 3.1.0 + vscode-uri: 3.2.0 '@volar/language-core@2.4.28': dependencies: @@ -13490,14 +13457,14 @@ snapshots: vscode-languageserver: 9.0.1 vscode-languageserver-protocol: 3.18.2 vscode-languageserver-textdocument: 1.0.12 - vscode-uri: 3.1.0 + vscode-uri: 3.2.0 '@volar/language-service@2.4.28': dependencies: '@volar/language-core': 2.4.28 vscode-languageserver-protocol: 3.18.2 vscode-languageserver-textdocument: 1.0.12 - vscode-uri: 3.1.0 + vscode-uri: 3.2.0 '@volar/source-map@2.4.28': {} @@ -13513,7 +13480,7 @@ snapshots: jsonc-parser: 2.3.1 vscode-languageserver-textdocument: 1.0.12 vscode-languageserver-types: 3.18.0 - vscode-uri: 3.1.0 + vscode-uri: 3.2.0 '@vscode/l10n@0.0.18': {} @@ -13585,14 +13552,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@vue/compiler-core@3.5.41': - dependencies: - '@babel/parser': 7.29.8 - '@vue/shared': 3.5.41 - entities: 7.0.1 - estree-walker: 2.0.2 - source-map-js: 1.2.1 - '@vue/compiler-core@3.5.42': dependencies: '@babel/parser': 7.29.8 @@ -13601,28 +13560,11 @@ snapshots: estree-walker: 2.0.2 source-map-js: 1.2.1 - '@vue/compiler-dom@3.5.41': - dependencies: - '@vue/compiler-core': 3.5.41 - '@vue/shared': 3.5.41 - '@vue/compiler-dom@3.5.42': dependencies: '@vue/compiler-core': 3.5.42 '@vue/shared': 3.5.42 - '@vue/compiler-sfc@3.5.41': - dependencies: - '@babel/parser': 7.29.8 - '@vue/compiler-core': 3.5.41 - '@vue/compiler-dom': 3.5.41 - '@vue/compiler-ssr': 3.5.41 - '@vue/shared': 3.5.41 - estree-walker: 2.0.2 - magic-string: 0.30.21 - postcss: 8.5.26 - source-map-js: 1.2.1 - '@vue/compiler-sfc@3.5.42': dependencies: '@babel/parser': 7.29.8 @@ -13635,11 +13577,6 @@ snapshots: postcss: 8.5.26 source-map-js: 1.2.1 - '@vue/compiler-ssr@3.5.41': - dependencies: - '@vue/compiler-dom': 3.5.41 - '@vue/shared': 3.5.41 - '@vue/compiler-ssr@3.5.42': dependencies: '@vue/compiler-dom': 3.5.42 @@ -13726,8 +13663,6 @@ snapshots: '@vue/runtime-dom': 3.5.42 '@vue/shared': 3.5.42 - '@vue/shared@3.5.41': {} - '@vue/shared@3.5.42': {} '@vue/test-utils@2.4.11(@vue/compiler-dom@3.5.42)(@vue/server-renderer@3.5.42)(vue@3.5.42(typescript@6.0.3))': @@ -13755,7 +13690,7 @@ snapshots: '@vueuse/shared': 14.4.0(vue@3.5.42(typescript@6.0.3)) vue: 3.5.42(typescript@6.0.3) - '@vueuse/integrations@14.4.0(axios@1.18.1(debug@4.4.3))(fuse.js@7.0.0)(vue@3.5.42(typescript@6.0.3))': + '@vueuse/integrations@14.4.0(axios@1.18.1)(fuse.js@7.0.0)(vue@3.5.42(typescript@6.0.3))': dependencies: '@vueuse/core': 14.4.0(vue@3.5.42(typescript@6.0.3)) '@vueuse/shared': 14.4.0(vue@3.5.42(typescript@6.0.3)) @@ -14007,7 +13942,7 @@ snapshots: js-yaml: 4.3.1 jsonc-parser: 3.3.1 magic-string: 1.1.1 - magicast: 0.5.3 + magicast: 0.5.4 mrmime: 2.0.1 neotraverse: 1.0.1 obug: 2.1.4 @@ -16136,12 +16071,6 @@ snapshots: dependencies: '@jridgewell/sourcemap-codec': 1.6.0 - magicast@0.5.3: - dependencies: - '@babel/parser': 7.29.8 - '@babel/types': 7.29.8 - source-map-js: 1.2.1 - magicast@0.5.4: dependencies: '@babel/parser': 7.29.8 @@ -18794,7 +18723,7 @@ snapshots: dependencies: vscode-css-languageservice: 6.3.10 vscode-languageserver-textdocument: 1.0.12 - vscode-uri: 3.1.0 + vscode-uri: 3.2.0 optionalDependencies: '@volar/language-service': 2.4.28 @@ -18803,7 +18732,7 @@ snapshots: '@emmetio/css-parser': 0.4.1 '@emmetio/html-matcher': 1.3.0 '@vscode/emmet-helper': 2.11.0 - vscode-uri: 3.1.0 + vscode-uri: 3.2.0 optionalDependencies: '@volar/language-service': 2.4.28 @@ -18811,20 +18740,20 @@ snapshots: dependencies: vscode-html-languageservice: 5.6.2 vscode-languageserver-textdocument: 1.0.12 - vscode-uri: 3.1.0 + vscode-uri: 3.2.0 optionalDependencies: '@volar/language-service': 2.4.28 volar-service-prettier@0.0.71(@volar/language-service@2.4.28)(prettier@3.9.5): dependencies: - vscode-uri: 3.1.0 + vscode-uri: 3.2.0 optionalDependencies: '@volar/language-service': 2.4.28 prettier: 3.9.5 volar-service-typescript-twoslash-queries@0.0.71(@volar/language-service@2.4.28): dependencies: - vscode-uri: 3.1.0 + vscode-uri: 3.2.0 optionalDependencies: '@volar/language-service': 2.4.28 @@ -18835,13 +18764,13 @@ snapshots: typescript-auto-import-cache: 0.3.6 vscode-languageserver-textdocument: 1.0.12 vscode-nls: 5.2.0 - vscode-uri: 3.1.0 + vscode-uri: 3.2.0 optionalDependencies: '@volar/language-service': 2.4.28 volar-service-yaml@0.0.71(@volar/language-service@2.4.28): dependencies: - vscode-uri: 3.1.0 + vscode-uri: 3.2.0 yaml-language-server: 1.23.0 optionalDependencies: '@volar/language-service': 2.4.28 @@ -18851,14 +18780,14 @@ snapshots: '@vscode/l10n': 0.0.18 vscode-languageserver-textdocument: 1.0.12 vscode-languageserver-types: 3.17.5 - vscode-uri: 3.1.0 + vscode-uri: 3.2.0 vscode-html-languageservice@5.6.2: dependencies: '@vscode/l10n': 0.0.18 vscode-languageserver-textdocument: 1.0.12 vscode-languageserver-types: 3.18.0 - vscode-uri: 3.1.0 + vscode-uri: 3.2.0 vscode-json-languageservice@4.1.8: dependencies: @@ -18866,7 +18795,7 @@ snapshots: vscode-languageserver-textdocument: 1.0.12 vscode-languageserver-types: 3.18.0 vscode-nls: 5.2.0 - vscode-uri: 3.1.0 + vscode-uri: 3.2.0 vscode-jsonrpc@8.2.0: {} @@ -18894,8 +18823,6 @@ snapshots: vscode-nls@5.2.0: {} - vscode-uri@3.1.0: {} - vscode-uri@3.2.0: {} vue-component-meta@3.3.7(typescript@5.9.3): @@ -18917,7 +18844,7 @@ snapshots: '@babel/parser': 7.29.8 '@babel/types': 7.29.8 '@vue/compiler-dom': 3.5.42 - '@vue/compiler-sfc': 3.5.41 + '@vue/compiler-sfc': 3.5.42 ast-types: 0.16.1 esm-resolve: 1.0.11 hash-sum: 2.0.0 @@ -19195,7 +19122,7 @@ snapshots: vscode-languageserver: 9.0.1 vscode-languageserver-textdocument: 1.0.12 vscode-languageserver-types: 3.18.0 - vscode-uri: 3.1.0 + vscode-uri: 3.2.0 yaml: 2.9.0 yaml@2.9.0: {} From bb9c9d6f2d9dce444d3f81a4963cdb986851ff39 Mon Sep 17 00:00:00 2001 From: jaeone94 Date: Thu, 1 Oct 2026 09:34:54 +0900 Subject: [PATCH 8/8] revert: remove PR-specific lint script and lockfile changes --- package.json | 3 +- pnpm-lock.yaml | 119 +++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 97 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index d4a62c3af21..780fa6146ed 100644 --- a/package.json +++ b/package.json @@ -43,8 +43,7 @@ "knip:no-cache": "knip", "knip": "knip --cache", "lint:fix:no-cache": "pnpm oxlint:repo --fix && pnpm oxlint:audit && eslint --concurrency auto --fix", - "lint:fix:ci": "pnpm lint:fix --cache-strategy content", - "lint:fix": "pnpm oxlint:repo --fix && pnpm oxlint:audit && eslint --cache --concurrency auto --fix", + "lint:fix": "pnpm oxlint:repo --fix && pnpm oxlint:audit && eslint --cache --cache-strategy content --concurrency auto --fix", "lint:no-cache": "pnpm exec stylelint '{apps,packages,src}/**/*.{css,vue}' && pnpm oxlint && eslint --concurrency auto", "lint:unstaged:fix": "tsx scripts/lint-unstaged.ts --fix", "lint:unstaged": "tsx scripts/lint-unstaged.ts", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index becc4a8c930..dc8d222b738 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -598,7 +598,7 @@ importers: version: 14.4.0(vue@3.5.42(typescript@6.0.3)) '@vueuse/integrations': specifier: 'catalog:' - version: 14.4.0(axios@1.18.1)(fuse.js@7.0.0)(vue@3.5.42(typescript@6.0.3)) + version: 14.4.0(axios@1.18.1(debug@4.4.3))(fuse.js@7.0.0)(vue@3.5.42(typescript@6.0.3)) '@vueuse/router': specifier: ^14.4.0 version: 14.4.0(vue-router@5.2.0(@vue/compiler-sfc@3.5.42)(esbuild@0.28.1)(pinia@4.0.2(@vue/devtools-api@8.1.5)(typescript@6.0.3)(vue@3.5.42(typescript@6.0.3)))(rolldown@1.2.6)(vite@8.2.2(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.49.0)(tsx@4.23.1)(yaml@2.9.0))(vue@3.5.42(typescript@6.0.3)))(vue@3.5.42(typescript@6.0.3)) @@ -755,7 +755,7 @@ importers: version: 14.6.1(@testing-library/dom@10.4.1) '@testing-library/vue': specifier: 'catalog:' - version: 8.1.0(@vue/compiler-dom@3.5.42)(@vue/compiler-sfc@3.5.42)(@vue/server-renderer@3.5.42)(vue@3.5.42(typescript@6.0.3)) + version: 8.1.0(@vue/compiler-dom@3.5.42)(@vue/compiler-sfc@3.5.41)(@vue/server-renderer@3.5.42)(vue@3.5.42(typescript@6.0.3)) '@total-typescript/shoehorn': specifier: 'catalog:' version: 0.1.2 @@ -1174,7 +1174,7 @@ importers: version: 14.6.1(@testing-library/dom@10.4.1) '@testing-library/vue': specifier: 'catalog:' - version: 8.1.0(@vue/compiler-dom@3.5.42)(@vue/compiler-sfc@3.5.42)(@vue/server-renderer@3.5.42)(vue@3.5.42(typescript@6.0.3)) + version: 8.1.0(@vue/compiler-dom@3.5.42)(@vue/compiler-sfc@3.5.41)(@vue/server-renderer@3.5.42)(vue@3.5.42(typescript@6.0.3)) '@total-typescript/shoehorn': specifier: 'catalog:' version: 0.1.2 @@ -5172,15 +5172,27 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 + '@vue/compiler-core@3.5.41': + resolution: {integrity: sha512-q0Xtv/F9w2YO/7htQhtiL+Ev2WCJbe5N2hc+XfgyKkEKqWpSxknmT8QOuGdEKNdjPq0c3F7rNpFkTo3Kfrm7pg==} + '@vue/compiler-core@3.5.42': resolution: {integrity: sha512-2Ye1ilMtKXxl8qZUrQ5j0CdgenFp/HFQmta6rfRyfEsTG69L6Wk+tWuNoHYHMx9E8tF2Slvdg1FuwDvAXdy1LQ==} + '@vue/compiler-dom@3.5.41': + resolution: {integrity: sha512-oKacVfNglLvGjnS6BXOlGL7EyG2h8X03pqXCjzotRZUaXGjbrTJUnVAQjrCqUnS+lyu31nwQjZY/d817GmCnfw==} + '@vue/compiler-dom@3.5.42': resolution: {integrity: sha512-qbhQZEFmycr+ni/qyuccS4sucNN7VAbDfbkvNxWOX2VfgFm90MNs3/UhRNKoPMEIVn0F8gdlYjLPvqxHwHeQOA==} + '@vue/compiler-sfc@3.5.41': + resolution: {integrity: sha512-XJhip7R2wy6vX3knCxdZN4KracFaZUef58s1KYewqluedHIJaPIVfXoYT7MF1F8nCvv6k8bWWxDC8opMkg1VTQ==} + '@vue/compiler-sfc@3.5.42': resolution: {integrity: sha512-fkCAFB4okcAANGMThboWnScp/gzWjU0ZSkVnjTIiplmMDq2uq0tIB3j+xVu4rhv5rvOgBySCysudmbMd6xRRqw==} + '@vue/compiler-ssr@3.5.41': + resolution: {integrity: sha512-U3v5OejKEGqOI0Wy0+Sz7hGuIFZHA4LSXzrNM3IMIeDyJEBBfTpX26n3SDgToRpP2bLc9FfI2j/kSgcJ8Emq5A==} + '@vue/compiler-ssr@3.5.42': resolution: {integrity: sha512-xmLk3wLkbizPAiLyomjgFFosf2ys9b5Ghb+oh/k2tnvipNz8OFrQOiTcWCzyK7MpBp9KkyGtfvgfLUivbmuGYA==} @@ -5228,6 +5240,9 @@ packages: '@vue/server-renderer@3.5.42': resolution: {integrity: sha512-2++5dUyYS4gvo7xQXSECUDhB7TS0aOl5SeVfC5qSq1Jgfhjvegw1zqhwTIR3imZ+QYPJQw9gfcFvXGAjGZ7ajQ==} + '@vue/shared@3.5.41': + resolution: {integrity: sha512-IOnwSCma8j+9xJT6b8H0dEYidC80NsYmNMlZxRsukYcSoGaDBohog5hDxzeUXdFeGWFA++vWvxqOmrr96VlqMA==} + '@vue/shared@3.5.42': resolution: {integrity: sha512-2rPxex1jQf4jvl9MOHl6YaXCPcrNqz/FstMOEh3QWY+/OME9nQTvl9WYeCwhW7AFjaR0SnngZGlp/wkR6rkI6g==} @@ -7439,6 +7454,9 @@ packages: magic-string@1.1.1: resolution: {integrity: sha512-qFemKPzc3ttrYVaMmnSkGtGc5nE6Ncl4bj7c9IE6C9OUIRXjf6PzJ+UZ1xhVIjYc7dolHq3qKzpAJPZUbvNj+A==} + magicast@0.5.3: + resolution: {integrity: sha512-pVKE4UdSQ7DvHzivsCIFx2BJn1mHG6KsyrFcaxFx6tONdneEuThrDx0Cj3AMg58KyN4pzYT+LHOotxDQDjNvkw==} + magicast@0.5.4: resolution: {integrity: sha512-llBEhWm1SacoRwgHUoQJYtwp4PBLF4faQi5TCpIGyGs9n4y5+juI0tDgyKIfpqxckRHaHzouUEph3THklWh03w==} @@ -9617,6 +9635,9 @@ packages: vscode-nls@5.2.0: resolution: {integrity: sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==} + vscode-uri@3.1.0: + resolution: {integrity: sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==} + vscode-uri@3.2.0: resolution: {integrity: sha512-m2gXo3bn0G1kT9InzMf07fTbqMbGtyckj3bH5ktLO+1Ssv+yiATZ4dhwaQv9UZWxJh6E9IFGnQyjgWVDWVBDrg==} @@ -10199,7 +10220,7 @@ snapshots: volar-service-typescript-twoslash-queries: 0.0.71(@volar/language-service@2.4.28) volar-service-yaml: 0.0.71(@volar/language-service@2.4.28) vscode-html-languageservice: 5.6.2 - vscode-uri: 3.2.0 + vscode-uri: 3.1.0 optionalDependencies: prettier: 3.9.5 prettier-plugin-astro: 1.0.0(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)(prettier@3.9.5) @@ -10279,7 +10300,7 @@ snapshots: dependencies: '@vitejs/plugin-vue': 6.0.8(vite@8.2.2(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.49.0)(tsx@4.23.1)(yaml@2.9.0))(vue@3.5.42(typescript@6.0.3)) '@vitejs/plugin-vue-jsx': 5.1.6(vite@8.2.2(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.49.0)(tsx@4.23.1)(yaml@2.9.0))(vue@3.5.42(typescript@6.0.3)) - '@vue/compiler-sfc': 3.5.42 + '@vue/compiler-sfc': 3.5.41 astro: 7.2.1(@astrojs/markdown-remark@7.2.2)(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)(@types/node@25.9.5)(jiti@2.7.0)(terser@5.49.0)(tsx@4.23.1)(yaml@2.9.0) vite: 8.2.2(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.49.0)(tsx@4.23.1)(yaml@2.9.0) vite-plugin-vue-devtools: 8.2.1(vite@8.2.2(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.49.0)(tsx@4.23.1)(yaml@2.9.0))(vue@3.5.42(typescript@6.0.3)) @@ -12752,6 +12773,18 @@ snapshots: dependencies: '@testing-library/dom': 10.4.1 + '@testing-library/vue@8.1.0(@vue/compiler-dom@3.5.42)(@vue/compiler-sfc@3.5.41)(@vue/server-renderer@3.5.42)(vue@3.5.42(typescript@6.0.3))': + dependencies: + '@babel/runtime': 7.29.7 + '@testing-library/dom': 9.3.4 + '@vue/test-utils': 2.4.11(@vue/compiler-dom@3.5.42)(@vue/server-renderer@3.5.42)(vue@3.5.42(typescript@6.0.3)) + vue: 3.5.42(typescript@6.0.3) + optionalDependencies: + '@vue/compiler-sfc': 3.5.41 + transitivePeerDependencies: + - '@vue/compiler-dom' + - '@vue/server-renderer' + '@testing-library/vue@8.1.0(@vue/compiler-dom@3.5.42)(@vue/compiler-sfc@3.5.42)(@vue/server-renderer@3.5.42)(vue@3.5.42(typescript@6.0.3))': dependencies: '@babel/runtime': 7.29.7 @@ -13441,7 +13474,7 @@ snapshots: typesafe-path: 0.2.2 typescript: 6.0.3 vscode-languageserver-textdocument: 1.0.12 - vscode-uri: 3.2.0 + vscode-uri: 3.1.0 '@volar/language-core@2.4.28': dependencies: @@ -13457,14 +13490,14 @@ snapshots: vscode-languageserver: 9.0.1 vscode-languageserver-protocol: 3.18.2 vscode-languageserver-textdocument: 1.0.12 - vscode-uri: 3.2.0 + vscode-uri: 3.1.0 '@volar/language-service@2.4.28': dependencies: '@volar/language-core': 2.4.28 vscode-languageserver-protocol: 3.18.2 vscode-languageserver-textdocument: 1.0.12 - vscode-uri: 3.2.0 + vscode-uri: 3.1.0 '@volar/source-map@2.4.28': {} @@ -13480,7 +13513,7 @@ snapshots: jsonc-parser: 2.3.1 vscode-languageserver-textdocument: 1.0.12 vscode-languageserver-types: 3.18.0 - vscode-uri: 3.2.0 + vscode-uri: 3.1.0 '@vscode/l10n@0.0.18': {} @@ -13552,6 +13585,14 @@ snapshots: transitivePeerDependencies: - supports-color + '@vue/compiler-core@3.5.41': + dependencies: + '@babel/parser': 7.29.8 + '@vue/shared': 3.5.41 + entities: 7.0.1 + estree-walker: 2.0.2 + source-map-js: 1.2.1 + '@vue/compiler-core@3.5.42': dependencies: '@babel/parser': 7.29.8 @@ -13560,11 +13601,28 @@ snapshots: estree-walker: 2.0.2 source-map-js: 1.2.1 + '@vue/compiler-dom@3.5.41': + dependencies: + '@vue/compiler-core': 3.5.41 + '@vue/shared': 3.5.41 + '@vue/compiler-dom@3.5.42': dependencies: '@vue/compiler-core': 3.5.42 '@vue/shared': 3.5.42 + '@vue/compiler-sfc@3.5.41': + dependencies: + '@babel/parser': 7.29.8 + '@vue/compiler-core': 3.5.41 + '@vue/compiler-dom': 3.5.41 + '@vue/compiler-ssr': 3.5.41 + '@vue/shared': 3.5.41 + estree-walker: 2.0.2 + magic-string: 0.30.21 + postcss: 8.5.26 + source-map-js: 1.2.1 + '@vue/compiler-sfc@3.5.42': dependencies: '@babel/parser': 7.29.8 @@ -13577,6 +13635,11 @@ snapshots: postcss: 8.5.26 source-map-js: 1.2.1 + '@vue/compiler-ssr@3.5.41': + dependencies: + '@vue/compiler-dom': 3.5.41 + '@vue/shared': 3.5.41 + '@vue/compiler-ssr@3.5.42': dependencies: '@vue/compiler-dom': 3.5.42 @@ -13663,6 +13726,8 @@ snapshots: '@vue/runtime-dom': 3.5.42 '@vue/shared': 3.5.42 + '@vue/shared@3.5.41': {} + '@vue/shared@3.5.42': {} '@vue/test-utils@2.4.11(@vue/compiler-dom@3.5.42)(@vue/server-renderer@3.5.42)(vue@3.5.42(typescript@6.0.3))': @@ -13690,7 +13755,7 @@ snapshots: '@vueuse/shared': 14.4.0(vue@3.5.42(typescript@6.0.3)) vue: 3.5.42(typescript@6.0.3) - '@vueuse/integrations@14.4.0(axios@1.18.1)(fuse.js@7.0.0)(vue@3.5.42(typescript@6.0.3))': + '@vueuse/integrations@14.4.0(axios@1.18.1(debug@4.4.3))(fuse.js@7.0.0)(vue@3.5.42(typescript@6.0.3))': dependencies: '@vueuse/core': 14.4.0(vue@3.5.42(typescript@6.0.3)) '@vueuse/shared': 14.4.0(vue@3.5.42(typescript@6.0.3)) @@ -13942,7 +14007,7 @@ snapshots: js-yaml: 4.3.1 jsonc-parser: 3.3.1 magic-string: 1.1.1 - magicast: 0.5.4 + magicast: 0.5.3 mrmime: 2.0.1 neotraverse: 1.0.1 obug: 2.1.4 @@ -16071,6 +16136,12 @@ snapshots: dependencies: '@jridgewell/sourcemap-codec': 1.6.0 + magicast@0.5.3: + dependencies: + '@babel/parser': 7.29.8 + '@babel/types': 7.29.8 + source-map-js: 1.2.1 + magicast@0.5.4: dependencies: '@babel/parser': 7.29.8 @@ -18723,7 +18794,7 @@ snapshots: dependencies: vscode-css-languageservice: 6.3.10 vscode-languageserver-textdocument: 1.0.12 - vscode-uri: 3.2.0 + vscode-uri: 3.1.0 optionalDependencies: '@volar/language-service': 2.4.28 @@ -18732,7 +18803,7 @@ snapshots: '@emmetio/css-parser': 0.4.1 '@emmetio/html-matcher': 1.3.0 '@vscode/emmet-helper': 2.11.0 - vscode-uri: 3.2.0 + vscode-uri: 3.1.0 optionalDependencies: '@volar/language-service': 2.4.28 @@ -18740,20 +18811,20 @@ snapshots: dependencies: vscode-html-languageservice: 5.6.2 vscode-languageserver-textdocument: 1.0.12 - vscode-uri: 3.2.0 + vscode-uri: 3.1.0 optionalDependencies: '@volar/language-service': 2.4.28 volar-service-prettier@0.0.71(@volar/language-service@2.4.28)(prettier@3.9.5): dependencies: - vscode-uri: 3.2.0 + vscode-uri: 3.1.0 optionalDependencies: '@volar/language-service': 2.4.28 prettier: 3.9.5 volar-service-typescript-twoslash-queries@0.0.71(@volar/language-service@2.4.28): dependencies: - vscode-uri: 3.2.0 + vscode-uri: 3.1.0 optionalDependencies: '@volar/language-service': 2.4.28 @@ -18764,13 +18835,13 @@ snapshots: typescript-auto-import-cache: 0.3.6 vscode-languageserver-textdocument: 1.0.12 vscode-nls: 5.2.0 - vscode-uri: 3.2.0 + vscode-uri: 3.1.0 optionalDependencies: '@volar/language-service': 2.4.28 volar-service-yaml@0.0.71(@volar/language-service@2.4.28): dependencies: - vscode-uri: 3.2.0 + vscode-uri: 3.1.0 yaml-language-server: 1.23.0 optionalDependencies: '@volar/language-service': 2.4.28 @@ -18780,14 +18851,14 @@ snapshots: '@vscode/l10n': 0.0.18 vscode-languageserver-textdocument: 1.0.12 vscode-languageserver-types: 3.17.5 - vscode-uri: 3.2.0 + vscode-uri: 3.1.0 vscode-html-languageservice@5.6.2: dependencies: '@vscode/l10n': 0.0.18 vscode-languageserver-textdocument: 1.0.12 vscode-languageserver-types: 3.18.0 - vscode-uri: 3.2.0 + vscode-uri: 3.1.0 vscode-json-languageservice@4.1.8: dependencies: @@ -18795,7 +18866,7 @@ snapshots: vscode-languageserver-textdocument: 1.0.12 vscode-languageserver-types: 3.18.0 vscode-nls: 5.2.0 - vscode-uri: 3.2.0 + vscode-uri: 3.1.0 vscode-jsonrpc@8.2.0: {} @@ -18823,6 +18894,8 @@ snapshots: vscode-nls@5.2.0: {} + vscode-uri@3.1.0: {} + vscode-uri@3.2.0: {} vue-component-meta@3.3.7(typescript@5.9.3): @@ -18844,7 +18917,7 @@ snapshots: '@babel/parser': 7.29.8 '@babel/types': 7.29.8 '@vue/compiler-dom': 3.5.42 - '@vue/compiler-sfc': 3.5.42 + '@vue/compiler-sfc': 3.5.41 ast-types: 0.16.1 esm-resolve: 1.0.11 hash-sum: 2.0.0 @@ -19122,7 +19195,7 @@ snapshots: vscode-languageserver: 9.0.1 vscode-languageserver-textdocument: 1.0.12 vscode-languageserver-types: 3.18.0 - vscode-uri: 3.2.0 + vscode-uri: 3.1.0 yaml: 2.9.0 yaml@2.9.0: {}