From 6e37d3d7f11a73856d031fa0a6edad717c123a2f Mon Sep 17 00:00:00 2001 From: jaeone94 <89377375+jaeone94@users.noreply.github.com> Date: Thu, 29 Oct 2026 10:27:38 +0900 Subject: [PATCH 01/10] test: pin annotated widget value splitting on edge paths --- .../useWidgetSelectActions.test.ts | 38 ++++++++++++++++ src/utils/imageUtil.test.ts | 44 +++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectActions.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectActions.test.ts index a42573b2ea1..a4f98ae1fbb 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectActions.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectActions.test.ts @@ -3,9 +3,12 @@ import { fromPartial } from '@total-typescript/shoehorn' import { computed, ref } from 'vue' import { beforeEach, describe, expect, it, vi } from 'vitest' +import { resolveWidgetValueAsset } from '@/platform/assets/utils/resolveWidgetValueAsset' import type { FormDropdownItem } from '@/renderer/extensions/vueNodes/widgets/components/form/dropdown/types' import { useWidgetSelectActions } from '@/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectActions' import { api } from '@/scripts/api' +import { useNodeOutputStore } from '@/stores/nodeOutputStore' +import type { NodeLocatorId } from '@comfyorg/graph-model/nodeIdentification' import { useToast } from '@/components/ui/toast/toastStore' import type { SimplifiedWidget } from '@/types/simplifiedWidget' import enMessages from '@/locales/en/main.json' @@ -13,6 +16,7 @@ import enMessages from '@/locales/en/main.json' const mockCaptureCanvasState = vi.hoisted(() => vi.fn()) vi.mock(import('@/scripts/api')) +vi.mock(import('@/platform/assets/utils/resolveWidgetValueAsset')) function createItems(...names: string[]): FormDropdownItem[] { return names.map((name, i) => ({ @@ -310,4 +314,38 @@ describe('useWidgetSelectActions', () => { ) }) }) + + describe('HDR preview', () => { + it('splits a backslash-separated value into subfolder and filename', async () => { + vi.mocked(resolveWidgetValueAsset).mockResolvedValue( + fromPartial({ preview_id: 'preview-1' }) + ) + const locatorId = fromPartial('7') + + useWidgetSelectActions({ + modelValue: ref('scenes\\sky.exr'), + dropdownItems: computed(() => []), + widget: () => + fromPartial>({ + name: 'image', + type: 'combo', + value: 'scenes\\sky.exr' + }), + uploadFolder: () => 'input', + uploadSubfolder: () => undefined, + locatorId: () => locatorId + }) + + await vi.waitFor(() => + expect(useNodeOutputStore().nodeOutputs[locatorId]?.images).toEqual([ + { + filename: 'sky.exr', + subfolder: 'scenes', + preview_id: 'preview-1', + type: 'input' + } + ]) + ) + }) + }) }) diff --git a/src/utils/imageUtil.test.ts b/src/utils/imageUtil.test.ts index b304bfaf083..acd0d8d7bf1 100644 --- a/src/utils/imageUtil.test.ts +++ b/src/utils/imageUtil.test.ts @@ -82,4 +82,48 @@ describe('parseImageWidgetValue', () => { type: 'input' }) }) + + it.for([ + { + raw: 'scenes\\sky.png [output]', + filename: 'sky.png', + subfolder: 'scenes', + type: 'output' + }, + { + raw: 'a\\b/sky.png', + filename: 'sky.png', + subfolder: 'a/b', + type: 'input' + }, + { + raw: '/sky.png [output]', + filename: '/sky.png', + subfolder: '', + type: 'output' + }, + { + raw: 'scenes/sky.png/ [output]', + filename: 'scenes/sky.png/', + subfolder: '', + type: 'output' + }, + { + raw: 'scenes/../sky.png [temp]', + filename: 'scenes/../sky.png', + subfolder: '', + type: 'temp' + }, + { + raw: 'D:\\sky.png [output]', + filename: 'D:\\sky.png', + subfolder: '', + type: 'output' + } + ])( + 'splits $raw only when every segment is a plain name', + ({ raw, ...expected }) => { + expect(parseImageWidgetValue(raw)).toEqual(expected) + } + ) }) From eb010105cee598465313e542731cf64960f6e0d0 Mon Sep 17 00:00:00 2001 From: jaeone94 <89377375+jaeone94@users.noreply.github.com> Date: Thu, 29 Oct 2026 10:39:19 +0900 Subject: [PATCH 02/10] refactor: share annotated widget value splitting across previews --- .../composables/useWidgetSelectActions.ts | 11 ++++---- .../composables/useWidgetSelectItems.ts | 23 +++-------------- src/utils/imageUtil.ts | 25 +++++++++++++------ 3 files changed, 26 insertions(+), 33 deletions(-) diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectActions.ts b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectActions.ts index d14ed9a8137..1b28136d9aa 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectActions.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectActions.ts @@ -16,8 +16,8 @@ import { useAssetsStore } from '@/stores/assetsStore' import { useNodeOutputStore } from '@/stores/nodeOutputStore' import type { NodeLocatorId } from '@comfyorg/graph-model/nodeIdentification' import type { SimplifiedWidget } from '@/types/simplifiedWidget' -import { parseAnnotatedPath } from '@/utils/createAnnotatedPath' import { isHdrImageFilename } from '@/utils/hdrFormatUtil' +import { parseImageWidgetValue } from '@/utils/imageUtil' import { isExtensionlessVideo } from '@/utils/mediaUploadUtil' import { isResultItemType } from '@/utils/typeGuardUtil' @@ -83,13 +83,12 @@ export function useWidgetSelectActions(options: UseWidgetSelectActionsOptions) { const asset = await resolveWidgetValueAsset(widgetValue) if (!asset?.preview_id || modelValue.value !== widgetValue) return - const { filepath, rootFolder } = parseAnnotatedPath(widgetValue) - const separatorIndex = filepath.lastIndexOf('/') + const { filename, subfolder, type } = parseImageWidgetValue(widgetValue) setPreviewImage({ - filename: filepath.slice(separatorIndex + 1), + filename, preview_id: asset.preview_id, - subfolder: filepath.slice(0, Math.max(separatorIndex, 0)), - type: isResultItemType(rootFolder) ? rootFolder : undefined + subfolder, + type: isResultItemType(type) ? type : undefined }) } ) diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts index df650b69ead..e06439628c8 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts @@ -29,8 +29,8 @@ import { getOutputAssetMetadata } from '@/platform/assets/schemas/assetMetadataS import type { AssetItem } from '@/platform/assets/schemas/assetSchema' import { resolveOutputAssetItems } from '@/platform/assets/utils/outputAssetUtil' import type { AssetKind } from '@/types/widgetTypes' -import { parseAnnotatedPath } from '@/utils/createAnnotatedPath' -import { getMediaTypeFromFilename, parseFilePath } from '@/utils/formatUtil' +import { getMediaTypeFromFilename } from '@/utils/formatUtil' +import { parseImageWidgetValue } from '@/utils/imageUtil' import type { PagedList } from '@/utils/pagedList' function getDisplayLabel( @@ -64,27 +64,12 @@ function getMediaUrl( return `/api/view?${params}` } -function isPlainRelativePath(filepath: string): boolean { - return filepath - .split(/[\\/]/) - .every( - (segment) => - segment !== '' && - segment !== '.' && - segment !== '..' && - !segment.includes(':') - ) -} - function getAnnotatedValueMediaUrl( value: string, assetKind: AssetKind | undefined ): string { - const { filepath, rootFolder } = parseAnnotatedPath(value) - if (!isPlainRelativePath(filepath)) - return getMediaUrl(filepath, rootFolder, assetKind) - const { filename, subfolder } = parseFilePath(filepath) - return getMediaUrl(filename, rootFolder, assetKind, subfolder) + const { filename, subfolder, type } = parseImageWidgetValue(value) + return getMediaUrl(filename, type, assetKind, subfolder) } export interface UseWidgetSelectItemsOptions { diff --git a/src/utils/imageUtil.ts b/src/utils/imageUtil.ts index af5fef9471f..19b95b7751f 100644 --- a/src/utils/imageUtil.ts +++ b/src/utils/imageUtil.ts @@ -1,5 +1,6 @@ import { appendCloudResParam } from '@/platform/distribution/cloudPreviewUtil' import { parseAnnotatedPath } from '@/utils/createAnnotatedPath' +import { parseFilePath } from '@/utils/formatUtil' const GRID_THUMBNAIL_PREVIEW_FORMAT = 'webp;75' @@ -32,8 +33,21 @@ export function getGridThumbnailUrl(url: string): string { : `${parsed.pathname}${parsed.search}` } +function isPlainRelativePath(filepath: string): boolean { + return filepath + .split(/[\\/]/) + .every( + (segment) => + segment !== '' && + segment !== '.' && + segment !== '..' && + !segment.includes(':') + ) +} + /** * Parses an image widget value like "subfolder/filename [type]" into its parts. + * Values with a non-plain path segment are kept whole as the filename. */ export function parseImageWidgetValue(raw: string): { filename: string @@ -41,14 +55,9 @@ export function parseImageWidgetValue(raw: string): { type: string } { const { filepath, rootFolder: type } = parseAnnotatedPath(raw) - let value = filepath - let subfolder = '' - const slashIndex = value.lastIndexOf('/') - if (slashIndex !== -1) { - subfolder = value.slice(0, slashIndex) - value = value.slice(slashIndex + 1) - } - return { filename: value, subfolder, type } + if (!isPlainRelativePath(filepath)) + return { filename: filepath, subfolder: '', type } + return { ...parseFilePath(filepath), type } } export const is_all_same_aspect_ratio = (imgs: HTMLImageElement[]): boolean => { From 552ec19437dc79a51c5e5a50af2ad8ae086b00a4 Mon Sep 17 00:00:00 2001 From: jaeone94 <89377375+jaeone94@users.noreply.github.com> Date: Thu, 29 Oct 2026 11:10:43 +0900 Subject: [PATCH 03/10] fix: keep subfolders for colon and doubled-separator widget values --- src/utils/imageUtil.test.ts | 14 +++++++++++++- src/utils/imageUtil.ts | 22 ++++++++++------------ 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/utils/imageUtil.test.ts b/src/utils/imageUtil.test.ts index acd0d8d7bf1..c77379330c6 100644 --- a/src/utils/imageUtil.test.ts +++ b/src/utils/imageUtil.test.ts @@ -96,6 +96,18 @@ describe('parseImageWidgetValue', () => { subfolder: 'a/b', type: 'input' }, + { + raw: 'pasted/12:30.png', + filename: '12:30.png', + subfolder: 'pasted', + type: 'input' + }, + { + raw: 'scenes//sky.png [output]', + filename: 'sky.png', + subfolder: 'scenes', + type: 'output' + }, { raw: '/sky.png [output]', filename: '/sky.png', @@ -121,7 +133,7 @@ describe('parseImageWidgetValue', () => { type: 'output' } ])( - 'splits $raw only when every segment is a plain name', + 'splits $raw into subfolder "$subfolder" and filename "$filename"', ({ raw, ...expected }) => { expect(parseImageWidgetValue(raw)).toEqual(expected) } diff --git a/src/utils/imageUtil.ts b/src/utils/imageUtil.ts index 19b95b7751f..5f9dab3aebb 100644 --- a/src/utils/imageUtil.ts +++ b/src/utils/imageUtil.ts @@ -33,21 +33,19 @@ export function getGridThumbnailUrl(url: string): string { : `${parsed.pathname}${parsed.search}` } -function isPlainRelativePath(filepath: string): boolean { - return filepath - .split(/[\\/]/) - .every( - (segment) => - segment !== '' && - segment !== '.' && - segment !== '..' && - !segment.includes(':') - ) +function isSplittableRelativePath(filepath: string): boolean { + const segments = filepath.split(/[\\/]/) + return ( + segments[0] !== '' && + !segments[0].includes(':') && + segments.at(-1) !== '' && + !segments.includes('..') + ) } /** * Parses an image widget value like "subfolder/filename [type]" into its parts. - * Values with a non-plain path segment are kept whole as the filename. + * Absolute, drive, parent-relative and trailing-separator paths stay whole in `filename`. */ export function parseImageWidgetValue(raw: string): { filename: string @@ -55,7 +53,7 @@ export function parseImageWidgetValue(raw: string): { type: string } { const { filepath, rootFolder: type } = parseAnnotatedPath(raw) - if (!isPlainRelativePath(filepath)) + if (!isSplittableRelativePath(filepath)) return { filename: filepath, subfolder: '', type } return { ...parseFilePath(filepath), type } } From 393b39390e8e976c40fcd60304bdea607b16c992 Mon Sep 17 00:00:00 2001 From: jaeone94 <89377375+jaeone94@users.noreply.github.com> Date: Thu, 29 Oct 2026 11:32:27 +0900 Subject: [PATCH 04/10] fix: split widget values on the last separator for every caller The plain-path guard came from the dropdown fallback, where passing an odd value through whole only affected a thumbnail. In the shared helper it changed what the mask editor, video, drop indicator and HDR preview load: colon folders, drive values, `..` segments and trailing separators all went to /view whole, where basename resolves them to a same-named file at the type root. Keep the existing last-separator split for every caller and only add `\` as a separator. --- .../composables/useWidgetSelectItems.test.ts | 24 ------------------- src/utils/imageUtil.test.ts | 22 ++++++++++------- src/utils/imageUtil.ts | 22 ++++++----------- 3 files changed, 21 insertions(+), 47 deletions(-) diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts index e3d48fff2d3..ccb9ca0379e 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts @@ -228,30 +228,6 @@ describe('useWidgetSelectItems', () => { { value: 'sub\\x.png [output]', query: { filename: 'x.png', type: 'output', subfolder: 'sub' } - }, - { - value: '/x.png [output]', - query: { filename: '/x.png', type: 'output' } - }, - { - value: '\\x.png [output]', - query: { filename: '\\x.png', type: 'output' } - }, - { - value: 'sub/x.png/ [output]', - query: { filename: 'sub/x.png/', type: 'output' } - }, - { - value: 'D:\\x.png [output]', - query: { filename: 'D:\\x.png', type: 'output' } - }, - { - value: '1:/x.png [output]', - query: { filename: '1:/x.png', type: 'output' } - }, - { - value: 'sub/../x.png [output]', - query: { filename: 'sub/../x.png', type: 'output' } } ])( 'previews the fallback for $value from its root, subfolder and filename', diff --git a/src/utils/imageUtil.test.ts b/src/utils/imageUtil.test.ts index c77379330c6..7d40ba6de30 100644 --- a/src/utils/imageUtil.test.ts +++ b/src/utils/imageUtil.test.ts @@ -102,34 +102,40 @@ describe('parseImageWidgetValue', () => { subfolder: 'pasted', type: 'input' }, + { + raw: '12:30/out.png [output]', + filename: 'out.png', + subfolder: '12:30', + type: 'output' + }, { raw: 'scenes//sky.png [output]', filename: 'sky.png', - subfolder: 'scenes', + subfolder: 'scenes/', type: 'output' }, { raw: '/sky.png [output]', - filename: '/sky.png', + filename: 'sky.png', subfolder: '', type: 'output' }, { raw: 'scenes/sky.png/ [output]', - filename: 'scenes/sky.png/', - subfolder: '', + filename: '', + subfolder: 'scenes/sky.png', type: 'output' }, { raw: 'scenes/../sky.png [temp]', - filename: 'scenes/../sky.png', - subfolder: '', + filename: 'sky.png', + subfolder: 'scenes/..', type: 'temp' }, { raw: 'D:\\sky.png [output]', - filename: 'D:\\sky.png', - subfolder: '', + filename: 'sky.png', + subfolder: 'D:', type: 'output' } ])( diff --git a/src/utils/imageUtil.ts b/src/utils/imageUtil.ts index 5f9dab3aebb..d28fa36816b 100644 --- a/src/utils/imageUtil.ts +++ b/src/utils/imageUtil.ts @@ -1,6 +1,5 @@ import { appendCloudResParam } from '@/platform/distribution/cloudPreviewUtil' import { parseAnnotatedPath } from '@/utils/createAnnotatedPath' -import { parseFilePath } from '@/utils/formatUtil' const GRID_THUMBNAIL_PREVIEW_FORMAT = 'webp;75' @@ -33,19 +32,8 @@ export function getGridThumbnailUrl(url: string): string { : `${parsed.pathname}${parsed.search}` } -function isSplittableRelativePath(filepath: string): boolean { - const segments = filepath.split(/[\\/]/) - return ( - segments[0] !== '' && - !segments[0].includes(':') && - segments.at(-1) !== '' && - !segments.includes('..') - ) -} - /** * Parses an image widget value like "subfolder/filename [type]" into its parts. - * Absolute, drive, parent-relative and trailing-separator paths stay whole in `filename`. */ export function parseImageWidgetValue(raw: string): { filename: string @@ -53,9 +41,13 @@ export function parseImageWidgetValue(raw: string): { type: string } { const { filepath, rootFolder: type } = parseAnnotatedPath(raw) - if (!isSplittableRelativePath(filepath)) - return { filename: filepath, subfolder: '', type } - return { ...parseFilePath(filepath), type } + const path = filepath.replaceAll('\\', '/') + const slashIndex = path.lastIndexOf('/') + return { + filename: path.slice(slashIndex + 1), + subfolder: path.slice(0, Math.max(slashIndex, 0)), + type + } } export const is_all_same_aspect_ratio = (imgs: HTMLImageElement[]): boolean => { From 1349af8d577905f58363b91a7a8f6046864f89bd Mon Sep 17 00:00:00 2001 From: jaeone94 <89377375+jaeone94@users.noreply.github.com> Date: Thu, 29 Oct 2026 11:54:49 +0900 Subject: [PATCH 05/10] fix: show no dropdown fallback preview for non-plain paths The fallback only exists for values the backend did not list, so it has no listed file to fall back on. Guessing a split for an absolute, drive, parent-relative, doubled or trailing-separator path can preview a different file than the node loads. Leave the preview empty for those values instead. The shared splitter keeps its split for the other callers. --- .../composables/useWidgetSelectItems.test.ts | 19 +++++++++++++++++++ .../composables/useWidgetSelectItems.ts | 14 ++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts index ccb9ca0379e..d5888772fb1 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts @@ -244,6 +244,25 @@ describe('useWidgetSelectItems', () => { } ) + it.for([ + '/x.png [output]', + '\\x.png [output]', + 'sub/x.png/ [output]', + 'sub//x.png [output]', + 'D:\\x.png [output]', + '1:/x.png [output]', + 'sub/../x.png [output]' + ])( + 'shows no fallback preview for %s, which is not a plain relative path', + (value) => { + const { dropdownItems } = useWidgetSelectItems( + createDefaultOptions({ values: () => [], modelValue: ref(value) }) + ) + + expect(dropdownItems.value[0].preview_url).toBe('') + } + ) + it('no fallback when modelValue is undefined', () => { const { dropdownItems } = useWidgetSelectItems( createDefaultOptions({ diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts index e06439628c8..aeb5c31e344 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts @@ -29,6 +29,7 @@ import { getOutputAssetMetadata } from '@/platform/assets/schemas/assetMetadataS import type { AssetItem } from '@/platform/assets/schemas/assetSchema' import { resolveOutputAssetItems } from '@/platform/assets/utils/outputAssetUtil' import type { AssetKind } from '@/types/widgetTypes' +import { parseAnnotatedPath } from '@/utils/createAnnotatedPath' import { getMediaTypeFromFilename } from '@/utils/formatUtil' import { parseImageWidgetValue } from '@/utils/imageUtil' import type { PagedList } from '@/utils/pagedList' @@ -64,10 +65,23 @@ function getMediaUrl( return `/api/view?${params}` } +function isPlainRelativePath(filepath: string): boolean { + return filepath + .split(/[\\/]/) + .every( + (segment) => + segment !== '' && + segment !== '.' && + segment !== '..' && + !segment.includes(':') + ) +} + function getAnnotatedValueMediaUrl( value: string, assetKind: AssetKind | undefined ): string { + if (!isPlainRelativePath(parseAnnotatedPath(value).filepath)) return '' const { filename, subfolder, type } = parseImageWidgetValue(value) return getMediaUrl(filename, type, assetKind, subfolder) } From f8e74215f547df6285e748a5e2f7e9f1f6074d04 Mon Sep 17 00:00:00 2001 From: jaeone94 <89377375+jaeone94@users.noreply.github.com> Date: Thu, 29 Oct 2026 12:13:28 +0900 Subject: [PATCH 06/10] fix: keep fallback previews for colon-bearing names outside a drive prefix --- .../composables/useWidgetSelectItems.test.ts | 12 ++++++++++++ .../widgets/composables/useWidgetSelectItems.ts | 15 +++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts index d5888772fb1..cbe24bdef44 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts @@ -228,6 +228,18 @@ describe('useWidgetSelectItems', () => { { value: 'sub\\x.png [output]', query: { filename: 'x.png', type: 'output', subfolder: 'sub' } + }, + { + value: '12:30.png [output]', + query: { filename: '12:30.png', type: 'output' } + }, + { + value: 'pasted/12:30.png [output]', + query: { filename: '12:30.png', type: 'output', subfolder: 'pasted' } + }, + { + value: '12:30/x.png [output]', + query: { filename: 'x.png', type: 'output', subfolder: '12:30' } } ])( 'previews the fallback for $value from its root, subfolder and filename', diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts index aeb5c31e344..7f3510c2462 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts @@ -66,15 +66,14 @@ function getMediaUrl( } function isPlainRelativePath(filepath: string): boolean { - return filepath - .split(/[\\/]/) - .every( - (segment) => - segment !== '' && - segment !== '.' && - segment !== '..' && - !segment.includes(':') + const segments = filepath.split(/[\\/]/) + const hasDrivePrefix = segments.length > 1 && segments[0].endsWith(':') + return ( + !hasDrivePrefix && + segments.every( + (segment) => segment !== '' && segment !== '.' && segment !== '..' ) + ) } function getAnnotatedValueMediaUrl( From bd9c3e554331cf7939655b0d0494767a31468f01 Mon Sep 17 00:00:00 2001 From: jaeone94 <89377375+jaeone94@users.noreply.github.com> Date: Thu, 29 Oct 2026 12:33:06 +0900 Subject: [PATCH 07/10] fix: treat drive-relative values as non-plain in the fallback preview --- .../widgets/composables/useWidgetSelectItems.test.ts | 2 ++ .../widgets/composables/useWidgetSelectItems.ts | 10 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts index cbe24bdef44..7f8a3e1a0a0 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts @@ -263,6 +263,8 @@ describe('useWidgetSelectItems', () => { 'sub//x.png [output]', 'D:\\x.png [output]', '1:/x.png [output]', + 'D:x.png [output]', + 'C:sub/x.png [output]', 'sub/../x.png [output]' ])( 'shows no fallback preview for %s, which is not a plain relative path', diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts index 7f3510c2462..ff233c2874b 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts @@ -66,13 +66,11 @@ function getMediaUrl( } function isPlainRelativePath(filepath: string): boolean { - const segments = filepath.split(/[\\/]/) - const hasDrivePrefix = segments.length > 1 && segments[0].endsWith(':') return ( - !hasDrivePrefix && - segments.every( - (segment) => segment !== '' && segment !== '.' && segment !== '..' - ) + !/^[^\\/]:/.test(filepath) && + filepath + .split(/[\\/]/) + .every((segment) => segment !== '' && segment !== '.' && segment !== '..') ) } From 658d06a38cb3d007c5b22a20e971d8ffdea65c91 Mon Sep 17 00:00:00 2001 From: jaeone94 <89377375+jaeone94@users.noreply.github.com> Date: Fri, 30 Oct 2026 09:46:25 +0900 Subject: [PATCH 08/10] test: cover dropdown option previews for subfolder and temp values --- .../composables/useWidgetSelectItems.test.ts | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts index 7f8a3e1a0a0..1301f94f85a 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts @@ -1101,6 +1101,76 @@ describe('useWidgetSelectItems', () => { }) }) + describe('option preview URLs', () => { + it.for([ + { value: 'x.png', query: { filename: 'x.png', type: 'input' } }, + { + value: 'sub/x.png', + query: { filename: 'x.png', type: 'input', subfolder: 'sub' } + }, + { + value: 'a\\b\\x.png', + query: { filename: 'x.png', type: 'input', subfolder: 'a/b' } + } + ])( + 'previews the input option $value from its subfolder and filename', + ({ value, query }) => { + const { dropdownItems } = useWidgetSelectItems( + createDefaultOptions({ + values: () => [value], + modelValue: ref(value) + }) + ) + + const previewUrl = dropdownItems.value[0].preview_url + assert(previewUrl) + const [path, search] = previewUrl.split('?') + expect(path).toBe('/api/view') + expect(Object.fromEntries(new URLSearchParams(search))).toEqual(query) + } + ) + + it.for([ + { + title: 'an output in a subfolder', + tags: ['output'], + subfolder: 'sub', + query: { filename: 'photo.png', type: 'output', subfolder: 'sub' } + }, + { + title: 'a generated temp output', + tags: ['output', 'temp'], + subfolder: 'previews', + query: { filename: 'photo.png', type: 'temp', subfolder: 'previews' } + } + ])( + 'falls back to a preview of $title from its root and subfolder', + async ({ tags, subfolder, query }) => { + mockMediaAssets.items.value = [ + fromPartial({ + id: 'asset-no-preview', + name: 'photo.png', + preview_url: '', + tags, + user_metadata: { subfolder } + }) + ] + + const { dropdownItems, filterSelected } = useWidgetSelectItems( + createDefaultOptions({ values: () => [], modelValue: ref(undefined) }) + ) + filterSelected.value = 'outputs' + await nextTick() + + const previewUrl = dropdownItems.value[0].preview_url + assert(previewUrl) + const [path, search] = previewUrl.split('?') + expect(path).toBe('/api/view') + expect(Object.fromEntries(new URLSearchParams(search))).toEqual(query) + } + ) + }) + describe('FE-228: output dropdown label uses human-readable filename', () => { it('renders metadata.filename in label when asset.name is a hash', async () => { mockMediaAssets.items.value = [ From 5289e0a8784eaaeba23d663a21a3fdde81162d4a Mon Sep 17 00:00:00 2001 From: jaeone94 <89377375+jaeone94@users.noreply.github.com> Date: Fri, 30 Oct 2026 09:47:26 +0900 Subject: [PATCH 09/10] fix: build dropdown option previews from the value's root and subfolder --- .../vueNodes/widgets/composables/useWidgetSelectItems.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts index ff233c2874b..6a1a250ac71 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts @@ -215,7 +215,7 @@ export function useWidgetSelectItems(options: UseWidgetSelectItemsOptions) { .filter((value) => !missing.has(String(value))) .map((value, index) => ({ id: `input-${index}`, - preview_url: getMediaUrl(String(value), 'input', kind), + preview_url: getAnnotatedValueMediaUrl(String(value), kind), name: String(value), label: getDisplayLabel(String(value), labelFn) })) @@ -259,7 +259,8 @@ export function useWidgetSelectItems(options: UseWidgetSelectItemsOptions) { preview_url: kind === 'mesh' ? '' - : asset.preview_url || getMediaUrl(filenameForUrl, 'output', kind), + : asset.preview_url || + getMediaUrl(filenameForUrl, rootFolder, kind, subfolder), name: annotatedPath, label: getDisplayLabel(displayLabel, labelFn) }) From 4f34702ee8939481ae708bd607fdac66874b13d5 Mon Sep 17 00:00:00 2001 From: jaeone94 <89377375+jaeone94@users.noreply.github.com> Date: Fri, 30 Oct 2026 18:56:44 +0900 Subject: [PATCH 10/10] test: pin empty previews for input options that are not plain relative paths --- .../composables/useWidgetSelectItems.test.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts index 1301f94f85a..2e8bd10fa72 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts @@ -1130,6 +1130,20 @@ describe('useWidgetSelectItems', () => { } ) + it.for(['../x.png', 'folder/./photo.png', '/abs/x.png', 'C:photo.png'])( + 'shows no preview for the input option %s, which is not a plain relative path', + (value) => { + const { dropdownItems } = useWidgetSelectItems( + createDefaultOptions({ + values: () => [value], + modelValue: ref(value) + }) + ) + + expect(dropdownItems.value[0].preview_url).toBe('') + } + ) + it.for([ { title: 'an output in a subfolder',