From 4d6617188280381e9a66901c9598e4295736b1a5 Mon Sep 17 00:00:00 2001 From: Glary-Bot Date: Sat, 10 Oct 2026 01:52:07 +0000 Subject: [PATCH 1/2] test: guard Clear workflow against inherited widget values (FE-3347) --- .../src/LGraph.clearWidgetValues.test.ts | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 src/lib/litegraph/src/LGraph.clearWidgetValues.test.ts diff --git a/src/lib/litegraph/src/LGraph.clearWidgetValues.test.ts b/src/lib/litegraph/src/LGraph.clearWidgetValues.test.ts new file mode 100644 index 00000000000..26c1d2dbabf --- /dev/null +++ b/src/lib/litegraph/src/LGraph.clearWidgetValues.test.ts @@ -0,0 +1,50 @@ +import { beforeEach, describe, expect, test } from 'vitest' + +import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' +import { useWidgetValueStore } from '@/stores/widgetValueStore' +import { widgetId } from '@/types/widgetId' + +const samplers = ['euler', 'dpmpp_2m'] + +function samplerNodeType(title: string) { + return class extends LGraphNode { + constructor() { + super(title) + this.addWidget('combo', 'sampler_name', 'euler', null, { + values: samplers + }) + } + } +} + +describe('LGraph.clear', () => { + beforeEach(() => { + LiteGraph.registerNodeType('test/Sampler', samplerNodeType('Sampler')) + LiteGraph.registerNodeType( + 'test/SamplerSelect', + samplerNodeType('SamplerSelect') + ) + }) + + function addNode(graph: LGraph, type: string) { + const node = LiteGraph.createNode(type)! + graph.add(node) + return node + } + + test('a node reusing a cleared node id does not inherit its widget value (#20648)', () => { + const graph = new LGraph() + const sampler = addNode(graph, 'test/Sampler') + sampler.widgets![0].value = 'dpmpp_2m' + const staleKey = widgetId(graph.id, sampler.id, 'sampler_name') + const store = useWidgetValueStore() + expect(store.getWidget(staleKey)?.value).toBe('dpmpp_2m') + + graph.clear() + expect(store.getWidget(staleKey)).toBeUndefined() + + const select = addNode(graph, 'test/SamplerSelect') + expect(select.id).toBe(sampler.id) + expect(select.widgets![0].value).toBe('euler') + }) +}) From fa0853340f38652803ecc880b1cbbf43460b0a13 Mon Sep 17 00:00:00 2001 From: Glary-Bot Date: Sat, 10 Oct 2026 02:54:19 +0000 Subject: [PATCH 2/2] test: fold FE-3347 clear regression into LGraph clear tests --- .../src/LGraph.clearWidgetValues.test.ts | 50 ------------------- src/lib/litegraph/src/LGraph.test.ts | 40 +++++++++++++++ 2 files changed, 40 insertions(+), 50 deletions(-) delete mode 100644 src/lib/litegraph/src/LGraph.clearWidgetValues.test.ts diff --git a/src/lib/litegraph/src/LGraph.clearWidgetValues.test.ts b/src/lib/litegraph/src/LGraph.clearWidgetValues.test.ts deleted file mode 100644 index 26c1d2dbabf..00000000000 --- a/src/lib/litegraph/src/LGraph.clearWidgetValues.test.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { beforeEach, describe, expect, test } from 'vitest' - -import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' -import { useWidgetValueStore } from '@/stores/widgetValueStore' -import { widgetId } from '@/types/widgetId' - -const samplers = ['euler', 'dpmpp_2m'] - -function samplerNodeType(title: string) { - return class extends LGraphNode { - constructor() { - super(title) - this.addWidget('combo', 'sampler_name', 'euler', null, { - values: samplers - }) - } - } -} - -describe('LGraph.clear', () => { - beforeEach(() => { - LiteGraph.registerNodeType('test/Sampler', samplerNodeType('Sampler')) - LiteGraph.registerNodeType( - 'test/SamplerSelect', - samplerNodeType('SamplerSelect') - ) - }) - - function addNode(graph: LGraph, type: string) { - const node = LiteGraph.createNode(type)! - graph.add(node) - return node - } - - test('a node reusing a cleared node id does not inherit its widget value (#20648)', () => { - const graph = new LGraph() - const sampler = addNode(graph, 'test/Sampler') - sampler.widgets![0].value = 'dpmpp_2m' - const staleKey = widgetId(graph.id, sampler.id, 'sampler_name') - const store = useWidgetValueStore() - expect(store.getWidget(staleKey)?.value).toBe('dpmpp_2m') - - graph.clear() - expect(store.getWidget(staleKey)).toBeUndefined() - - const select = addNode(graph, 'test/SamplerSelect') - expect(select.id).toBe(sampler.id) - expect(select.widgets![0].value).toBe('euler') - }) -}) diff --git a/src/lib/litegraph/src/LGraph.test.ts b/src/lib/litegraph/src/LGraph.test.ts index c3d7cc17591..3a7c171da2d 100644 --- a/src/lib/litegraph/src/LGraph.test.ts +++ b/src/lib/litegraph/src/LGraph.test.ts @@ -1063,6 +1063,46 @@ describe('Graph Clearing and Callbacks', () => { ) }) + test('a node reusing a cleared node id does not inherit its widget value (#20648)', () => { + const samplers = ['euler', 'dpmpp_2m'] + const samplerNodeType = (title: string) => + class extends LGraphNode { + constructor() { + super(title) + this.addWidget('combo', 'sampler_name', 'euler', null, { + values: samplers + }) + } + } + LiteGraph.registerNodeType('test/Sampler', samplerNodeType('Sampler')) + LiteGraph.registerNodeType( + 'test/SamplerSelect', + samplerNodeType('SamplerSelect') + ) + const addNode = (graph: LGraph, type: string) => { + const node = LiteGraph.createNode(type) + assert.exists(node) + graph.add(node) + const widget = node.widgets?.[0] + assert.exists(widget) + return { node, widget } + } + + const graph = new LGraph() + const sampler = addNode(graph, 'test/Sampler') + sampler.widget.value = 'dpmpp_2m' + const staleKey = widgetId(graph.id, sampler.node.id, 'sampler_name') + const store = useWidgetValueStore() + expect(store.getWidget(staleKey)?.value).toBe('dpmpp_2m') + + graph.clear() + expect(store.getWidget(staleKey)).toBeUndefined() + + const select = addNode(graph, 'test/SamplerSelect') + expect(select.node.id).toBe(sampler.node.id) + expect(select.widget.value).toBe('euler') + }) + test('configure clears state already stored under the incoming graph id', () => { const incoming = new LGraph() const incomingId = 'graph-configure-cleanup' as UUID