From 5d2c9f06c89dd9d4c69459fd6d1c9cd8fd4ee58e Mon Sep 17 00:00:00 2001 From: Matt Miller Date: Sat, 5 Sep 2026 02:26:57 -0700 Subject: [PATCH] chore: lint src/extensions/core and fix surfaced findings --- .oxlintrc.json | 7 ++- eslint.config.ts | 1 - src/extensions/core/agentPanel.test.ts | 24 +++++++---- .../core/cameraInfo/CameraInfoOverlay.ts | 4 +- .../core/cameraInfo/CameraInfoViewport.ts | 4 +- .../core/cameraInfo/handles/handlePicking.ts | 10 ++--- src/extensions/core/clipspace.ts | 7 ++- .../customWidgets.subgraphPromotion.test.ts | 2 +- src/extensions/core/electronAdapter.ts | 24 +++++------ src/extensions/core/groupNode.test.ts | 2 +- src/extensions/core/groupNode.ts | 43 ++++++++----------- src/extensions/core/groupOptions.test.ts | 2 +- src/extensions/core/groupOptions.ts | 8 +--- src/extensions/core/load3d.test.ts | 14 +++--- src/extensions/core/load3d.ts | 8 ++-- src/extensions/core/load3d/CameraManager.ts | 12 +++--- src/extensions/core/load3d/ControlsManager.ts | 2 +- src/extensions/core/load3d/EventManager.ts | 4 +- .../core/load3d/GizmoManager.test.ts | 5 +-- src/extensions/core/load3d/GizmoManager.ts | 2 +- src/extensions/core/load3d/LightingManager.ts | 6 +-- .../core/load3d/Load3DConfiguration.ts | 10 ++--- src/extensions/core/load3d/Load3d.test.ts | 6 +-- src/extensions/core/load3d/Load3d.ts | 11 +++-- .../core/load3d/LoaderManager.test.ts | 7 ++- .../core/load3d/MeshModelAdapter.ts | 2 +- src/extensions/core/load3d/ModelExporter.ts | 5 +-- .../core/load3d/PointCloudModelAdapter.ts | 2 +- .../core/load3d/RecordingManager.test.ts | 5 +-- .../core/load3d/RecordingManager.ts | 6 +-- .../core/load3d/SceneManager.test.ts | 9 +--- src/extensions/core/load3d/SceneManager.ts | 14 +++--- .../core/load3d/SceneModelManager.test.ts | 2 +- .../core/load3d/SceneModelManager.ts | 3 +- .../core/load3d/SplatModelAdapter.test.ts | 16 +++---- .../core/load3d/ViewHelperManager.test.ts | 2 +- .../core/load3d/ViewHelperManager.ts | 10 ++--- src/extensions/core/load3d/Viewport3d.test.ts | 2 +- src/extensions/core/load3d/constants.test.ts | 4 +- .../core/load3d/createLoad3d.test.ts | 19 +++----- src/extensions/core/load3d/createLoad3d.ts | 13 +++--- .../core/load3d/createViewport3d.ts | 10 ++--- .../core/load3d/exportMenuHelper.ts | 2 +- src/extensions/core/load3d/interfaces.ts | 2 +- .../core/load3d/load3dSerialize.test.ts | 2 +- src/extensions/core/load3dLazy.test.ts | 8 ++-- src/extensions/core/maskeditor.ts | 2 +- src/extensions/core/nodeTemplates.ts | 36 ++++++++-------- src/extensions/core/noteNode.ts | 7 ++- src/extensions/core/rerouteNode.ts | 3 +- .../core/saveImageExtraOutput.test.ts | 2 +- src/extensions/core/saveImageExtraOutput.ts | 14 ++---- src/extensions/core/saveMesh.test.ts | 10 ++--- src/extensions/core/simpleTouchSupport.ts | 6 +-- src/extensions/core/slotDefaults.ts | 12 +++--- src/extensions/core/uploadAudio.ts | 11 ++--- src/extensions/core/uploadImage.ts | 7 +-- src/extensions/core/webcamCapture.ts | 4 +- .../core/widgetInputs.refreshCombo.test.ts | 4 +- src/extensions/core/widgetInputs.test.ts | 18 +++----- 60 files changed, 235 insertions(+), 264 deletions(-) diff --git a/.oxlintrc.json b/.oxlintrc.json index 91e0a5403c6..d6d345a159d 100644 --- a/.oxlintrc.json +++ b/.oxlintrc.json @@ -11,7 +11,6 @@ "scripts/patch-playwright-agents.js", "scripts/registry-census/detection-proof/**", "src/__ecs_matrix__/**", - "src/extensions/core/*", "src/scripts/*", "src/types/generatedManagerTypes.ts", "src/types/vue-shim.d.ts", @@ -230,6 +229,12 @@ "playwright/valid-expect-in-promise": "error", "playwright/valid-title": "error" } + }, + { + "files": ["src/extensions/core/**"], + "rules": { + "typescript/no-unnecessary-condition": "warn" + } } ] } diff --git a/eslint.config.ts b/eslint.config.ts index c584b09ae35..8ec952e9a9a 100644 --- a/eslint.config.ts +++ b/eslint.config.ts @@ -176,7 +176,6 @@ export default defineConfig([ 'playwright-report/*', 'scripts/registry-census/detection-proof/**', 'src/__ecs_matrix__/**', - 'src/extensions/core/*', 'src/scripts/*', 'src/types/generatedManagerTypes.ts', 'src/types/vue-shim.d.ts', diff --git a/src/extensions/core/agentPanel.test.ts b/src/extensions/core/agentPanel.test.ts index e6ba34ece8a..e06e2252aaa 100644 --- a/src/extensions/core/agentPanel.test.ts +++ b/src/extensions/core/agentPanel.test.ts @@ -93,7 +93,7 @@ async function loadEntryAndSetup(): Promise { (e) => e.name === 'Comfy.AgentPanel' ) expect(ext).toBeDefined() - ext!.setup!({} as Parameters>[0]) + void ext!.setup!({} as Parameters>[0]) for (let i = 0; i < 2000 && mocks.flagListener === null; i++) await flush() expect(mocks.flagListener).toBeTypeOf('function') } @@ -189,7 +189,7 @@ describe('AgentPanel extension flag gate', () => { const selectItems = vi.fn() mocks.agentStore.enabled = true - extension!.beforeLoadGraph!({} as never) + void extension!.beforeLoadGraph!({} as never) expect(mocks.notifyBeforeGraphLoad).toHaveBeenCalledOnce() expect(mocks.nodeSelectionStore.beginWorkflowLoad).toHaveBeenCalledOnce() @@ -199,7 +199,7 @@ describe('AgentPanel extension flag gate', () => { mocks.getNodeByLocatorId.mockReturnValue(secondNode) mocks.workflowStore.activeWorkflow = { path: 'workflows/second.json' } - extension!.afterLoadGraph!({ + void extension!.afterLoadGraph!({ rootGraph, canvas: { selectItems @@ -220,7 +220,7 @@ describe('AgentPanel extension flag gate', () => { (item) => item.name === 'Comfy.AgentPanel' ) - extension!.afterConfigureGraph!([], {} as never) + void extension!.afterConfigureGraph!([], {} as never) expect(mocks.notifyAfterGraphConfigure).toHaveBeenCalledOnce() }) @@ -241,7 +241,10 @@ describe('AgentPanel extension flag gate', () => { mocks.nodeSelectionStore.nodeIds.mockReturnValue([locator]) mocks.getNodeByLocatorId.mockReturnValue(subgraphNode) - extension!.afterLoadGraph!({ rootGraph, canvas: { selectItems } } as never) + void extension!.afterLoadGraph!({ + rootGraph, + canvas: { selectItems } + } as never) expect(mocks.getNodeByLocatorId).toHaveBeenCalledWith(rootGraph, locator) expect(selectItems).toHaveBeenCalledWith([subgraphNode]) @@ -258,7 +261,7 @@ describe('AgentPanel extension flag gate', () => { ) mocks.agentStore.isOpen = false - extension!.beforeLoadGraph!({} as never) + void extension!.beforeLoadGraph!({} as never) expect(mocks.notifyBeforeGraphLoad).toHaveBeenCalledOnce() expect(mocks.nodeSelectionStore.beginWorkflowLoad).not.toHaveBeenCalled() @@ -273,7 +276,7 @@ describe('AgentPanel extension flag gate', () => { mocks.agentStore.isOpen = false mocks.nodeSelectionStore.isLoadingWorkflow = true - extension!.afterLoadGraph!({} as never) + void extension!.afterLoadGraph!({} as never) expect(mocks.nodeSelectionStore.finishWorkflowLoad).toHaveBeenCalledOnce() expect(mocks.getNodeByLocatorId).not.toHaveBeenCalled() @@ -288,7 +291,10 @@ describe('AgentPanel extension flag gate', () => { ) mocks.nodeSelectionStore.isLoadingWorkflow = true - extension!.onGraphLoadError!(new Error('bad workflow json'), {} as never) + void extension!.onGraphLoadError!( + new Error('bad workflow json'), + {} as never + ) expect(mocks.nodeSelectionStore.finishWorkflowLoad).toHaveBeenCalledOnce() }) @@ -320,7 +326,7 @@ describe('AgentPanel extension flag gate', () => { (item) => item.name === 'Comfy.AgentPanel' ) - extension!.beforeLoadGraph!({} as never) + void extension!.beforeLoadGraph!({} as never) expect(mocks.nodeSelectionStore.beginWorkflowLoad).not.toHaveBeenCalled() }) diff --git a/src/extensions/core/cameraInfo/CameraInfoOverlay.ts b/src/extensions/core/cameraInfo/CameraInfoOverlay.ts index 378237baa21..826c6aaff8d 100644 --- a/src/extensions/core/cameraInfo/CameraInfoOverlay.ts +++ b/src/extensions/core/cameraInfo/CameraInfoOverlay.ts @@ -179,9 +179,7 @@ export class CameraInfoOverlay implements SceneOverlay { if (!this.cameraHelper) return if (this.scene) this.scene.remove(this.cameraHelper) this.cameraHelper.geometry.dispose() - const material = this.cameraHelper.material as - | THREE.Material - | THREE.Material[] + const material = this.cameraHelper.material if (Array.isArray(material)) material.forEach((m) => m.dispose()) else material.dispose() this.cameraHelper = null diff --git a/src/extensions/core/cameraInfo/CameraInfoViewport.ts b/src/extensions/core/cameraInfo/CameraInfoViewport.ts index 1812c17d875..38bfb77cb8b 100644 --- a/src/extensions/core/cameraInfo/CameraInfoViewport.ts +++ b/src/extensions/core/cameraInfo/CameraInfoViewport.ts @@ -332,13 +332,13 @@ export class CameraInfoViewport { const targets = this.pickableTargetsFor(this.overlay.getState().mode) if (targets.length === 0) return null this.updatePointer(position) - return pickHandleAtPointer( + return pickHandleAtPointer( this.raycaster, this.pointer, this.viewport.cameraManager.activeCamera, targets, this.canvas - ) + ) as DragHandleType | null } private setHoveredHandle(type: DragHandleType | null): void { diff --git a/src/extensions/core/cameraInfo/handles/handlePicking.ts b/src/extensions/core/cameraInfo/handles/handlePicking.ts index 71cdcbeb8e6..bf45f11c0f0 100644 --- a/src/extensions/core/cameraInfo/handles/handlePicking.ts +++ b/src/extensions/core/cameraInfo/handles/handlePicking.ts @@ -18,22 +18,22 @@ function toScreenPx( ) } -export function pickHandleAtPointer( +export function pickHandleAtPointer( raycaster: THREE.Raycaster, pointerNdc: THREE.Vector2, camera: THREE.Camera, targets: THREE.Object3D[], canvas: CanvasSize -): T | null { +): string | null { if (targets.length === 0) return null raycaster.setFromCamera(pointerNdc, camera) const hits = raycaster.intersectObjects(targets, false) - if (hits.length > 0) return hits[0].object.userData.handleType as T + if (hits.length > 0) return hits[0].object.userData.handleType as string const pointerPx = toScreenPx(pointerNdc.x, pointerNdc.y, canvas) const world = new THREE.Vector3() - let best: T | null = null + let best: string | null = null let bestDistance = PICK_PIXEL_RADIUS for (const target of targets) { target.getWorldPosition(world) @@ -44,7 +44,7 @@ export function pickHandleAtPointer( const distance = px.distanceTo(pointerPx) if (distance < bestDistance) { bestDistance = distance - best = target.userData.handleType as T + best = target.userData.handleType as string } } return best diff --git a/src/extensions/core/clipspace.ts b/src/extensions/core/clipspace.ts index b6973286853..ad576c4a972 100644 --- a/src/extensions/core/clipspace.ts +++ b/src/extensions/core/clipspace.ts @@ -1,5 +1,4 @@ -import { app } from '../../scripts/app' -import { ComfyApp } from '../../scripts/app' +import { app, ComfyApp } from '../../scripts/app' import { $el, ComfyDialog } from '../../scripts/ui' class ClipspaceDialog extends ComfyDialog { @@ -85,7 +84,7 @@ class ClipspaceDialog extends ComfyDialog { override createButtons() { const buttons = [] - for (let idx in ClipspaceDialog.items) { + for (const idx in ClipspaceDialog.items) { const item = ClipspaceDialog.items[idx] if (!item.contextPredicate || item.contextPredicate()) buttons.push(ClipspaceDialog.items[idx]) @@ -150,7 +149,7 @@ class ClipspaceDialog extends ComfyDialog { $el('option', { value: 'selected' }, 'selected'), $el('option', { value: 'all' }, 'all') ] - ) as HTMLSelectElement + ) combo2.value = ComfyApp.clipspace['img_paste_mode'] const row2 = $el('tr', {}, [ diff --git a/src/extensions/core/customWidgets.subgraphPromotion.test.ts b/src/extensions/core/customWidgets.subgraphPromotion.test.ts index 5e8ac2dd139..d81c0c74075 100644 --- a/src/extensions/core/customWidgets.subgraphPromotion.test.ts +++ b/src/extensions/core/customWidgets.subgraphPromotion.test.ts @@ -173,7 +173,7 @@ describe('CustomCombo index widget after subgraph promotion', () => { findWidget(comboNode, 'choice')!.value = 'two' const { output } = await graphToPrompt(rootGraph) - const promptInputs = output[`${comboNode.id}`].inputs + const promptInputs = output[comboNode.id].inputs // "two" is index 1 of ["one", "two", "three"]. expect(promptInputs.index).toBe(1) diff --git a/src/extensions/core/electronAdapter.ts b/src/extensions/core/electronAdapter.ts index 72bcb401632..2b54621f6d4 100644 --- a/src/extensions/core/electronAdapter.ts +++ b/src/extensions/core/electronAdapter.ts @@ -10,7 +10,7 @@ import { useDialogService } from '@/services/dialogService' import { checkMirrorReachable } from '@/utils/electronMirrorCheck' import { isDesktop } from '@/platform/distribution/types' import { electronAPI as getElectronAPI } from '@/utils/envUtil' -;(async () => { +void (async () => { if (!isDesktop) return const electronAPI = getElectronAPI() @@ -22,7 +22,7 @@ import { electronAPI as getElectronAPI } from '@/utils/envUtil' const onChangeRestartApp = (newValue: unknown, oldValue: unknown) => { // Add a delay to allow changes to take effect before restarting. if (oldValue !== undefined && newValue !== oldValue) { - electronAPI.restartApp('Restart ComfyUI to apply changes.', 1500) + void electronAPI.restartApp('Restart ComfyUI to apply changes.', 1500) } } @@ -60,7 +60,7 @@ import { electronAPI as getElectronAPI } from '@/utils/envUtil' ) => { if (!oldValue) return - electronAPI.Config.setWindowStyle(newValue) + void electronAPI.Config.setWindowStyle(newValue) } }, { @@ -113,7 +113,7 @@ import { electronAPI as getElectronAPI } from '@/utils/envUtil' label: 'Open Models Folder', icon: 'pi pi-folder-open', function() { - electronAPI.openModelsFolder() + void electronAPI.openModelsFolder() } }, { @@ -121,7 +121,7 @@ import { electronAPI as getElectronAPI } from '@/utils/envUtil' label: 'Open Outputs Folder', icon: 'pi pi-folder-open', function() { - electronAPI.openOutputsFolder() + void electronAPI.openOutputsFolder() } }, { @@ -129,7 +129,7 @@ import { electronAPI as getElectronAPI } from '@/utils/envUtil' label: 'Open Inputs Folder', icon: 'pi pi-folder-open', function() { - electronAPI.openInputsFolder() + void electronAPI.openInputsFolder() } }, { @@ -137,7 +137,7 @@ import { electronAPI as getElectronAPI } from '@/utils/envUtil' label: 'Open Custom Nodes Folder', icon: 'pi pi-folder-open', function() { - electronAPI.openCustomNodesFolder() + void electronAPI.openCustomNodesFolder() } }, { @@ -145,7 +145,7 @@ import { electronAPI as getElectronAPI } from '@/utils/envUtil' label: 'Open extra_model_paths.yaml', icon: 'pi pi-file', function() { - electronAPI.openModelConfig() + void electronAPI.openModelConfig() } }, { @@ -198,7 +198,7 @@ import { electronAPI as getElectronAPI } from '@/utils/envUtil' }) if (proceed) { try { - electronAPI.restartAndInstall() + void electronAPI.restartAndInstall() } catch (error) { log.error('Error installing update:', error) toastStore.add({ @@ -229,7 +229,7 @@ import { electronAPI as getElectronAPI } from '@/utils/envUtil' type: 'reinstall' }) - if (proceed) electronAPI.reinstall() + if (proceed) void electronAPI.reinstall() } }, { @@ -237,7 +237,7 @@ import { electronAPI as getElectronAPI } from '@/utils/envUtil' label: 'Restart', icon: 'pi pi-refresh', function() { - electronAPI.restartApp() + void electronAPI.restartApp() } }, { @@ -256,7 +256,7 @@ import { electronAPI as getElectronAPI } from '@/utils/envUtil' if (!confirmed) return } - electronAPI.quit() + void electronAPI.quit() } } ], diff --git a/src/extensions/core/groupNode.test.ts b/src/extensions/core/groupNode.test.ts index 80ef35dc847..1bc52d79243 100644 --- a/src/extensions/core/groupNode.test.ts +++ b/src/extensions/core/groupNode.test.ts @@ -21,7 +21,7 @@ const extensionState = vi.hoisted(() => ({ ext: undefined as ComfyExtension | undefined, configuringGraph: false, rootGraph: { - extra: {} as Record, + extra: {}, nodes: [] as { id: string | number }[] }, registerNodeDef: diff --git a/src/extensions/core/groupNode.ts b/src/extensions/core/groupNode.ts index 3350da9d1d2..a30fcd2b330 100644 --- a/src/extensions/core/groupNode.ts +++ b/src/extensions/core/groupNode.ts @@ -1,8 +1,11 @@ import { PREFIX, SEPARATOR } from '@/constants/groupNodeConstants' import { t } from '@/i18n' import type { SerialisedLLinkArray } from '@/lib/litegraph/src/LLink' -import type { LGraphNodeConstructor } from '@/lib/litegraph/src/litegraph' -import { LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' +import type { + LGraphNodeConstructor, + LGraphNode +} from '@/lib/litegraph/src/litegraph' +import { LiteGraph } from '@/lib/litegraph/src/litegraph' import { outputLinks } from '@/lib/litegraph/src/node/slotLinks' import { parseNodeId } from '@/types/nodeId' import type { @@ -97,11 +100,6 @@ interface GroupNodeDef { output_is_list: boolean[] } -interface NodeConfigEntry { - input?: Record - output?: Record -} - export class GroupNodeConfig { name: string nodeData: GroupNodeWorkflowData @@ -197,9 +195,9 @@ export class GroupNodeConfig { ) continue - const srcId = Number(sourceNodeId) + const srcId = sourceNodeId const srcSlot = Number(sourceNodeSlot) - const tgtId = Number(targetNodeId) + const tgtId = targetNodeId const tgtSlot = Number(targetNodeSlot) if (!this.linksFrom[srcId]) { @@ -268,7 +266,7 @@ export class GroupNodeConfig { const source = output?.widget?.name const nodeIdx = linksFrom[0]?.[0]?.[2] if (source && nodeIdx != null) { - const fromTypeName = this.nodeData.nodes[Number(nodeIdx)]?.type + const fromTypeName = this.nodeData.nodes[nodeIdx]?.type if (fromTypeName) { const fromType = globalDefs[fromTypeName] const input = @@ -309,7 +307,7 @@ export class GroupNodeConfig { const id = link[2] const slot = link[3] if (id == null || slot == null) continue - const targetNode = this.nodeData.nodes[Number(id)] + const targetNode = this.nodeData.nodes[id] const input = targetNode?.inputs?.[Number(slot)] as | GroupNodeInput | undefined @@ -345,14 +343,13 @@ export class GroupNodeConfig { const id = link[0] const slot = link[1] if (id != null && slot != null) { - const outputType = - this.nodeData.nodes[Number(id)]?.outputs?.[Number(slot)] + const outputType = this.nodeData.nodes[id]?.outputs?.[Number(slot)] if ( outputType && typeof outputType === 'object' && 'type' in outputType ) { - rerouteType = String((outputType as GroupNodeOutput).type ?? '*') + rerouteType = (outputType as GroupNodeOutput).type ?? '*' } } } @@ -402,9 +399,7 @@ export class GroupNodeConfig { config: unknown[], extra?: Record ) { - const nodeConfig = this.nodeData.config?.[node.index ?? -1] as - | NodeConfigEntry - | undefined + const nodeConfig = this.nodeData.config?.[node.index ?? -1] const customConfig = nodeConfig?.input?.[inputName] let name = customConfig?.name ?? @@ -508,11 +503,11 @@ export class GroupNodeConfig { ) { const linkSourceIdx = link[0] if (linkSourceIdx == null) return - const sourceNode = this.nodeData.nodes[Number(linkSourceIdx)] + const sourceNode = this.nodeData.nodes[linkSourceIdx] if (sourceNode?.type === 'PrimitiveNode') { // Merge link configurations - const sourceNodeId = Number(link[0]) - const targetNodeId = Number(link[2]) + const sourceNodeId = link[0] + const targetNodeId = link[2] const primitiveDef = this.primitiveDefs[sourceNodeId] if (!primitiveDef) return const targetWidget = inputs[inputName] @@ -714,9 +709,7 @@ export class GroupNodeConfig { // If this output is linked internally we flag it to hide const hasLink = linksFrom?.[outputId] && !this.externalFrom[nodeIndex]?.[outputId] - const outputConfig = this.nodeData.config?.[node.index ?? -1] as - | NodeConfigEntry - | undefined + const outputConfig = this.nodeData.config?.[node.index ?? -1] const customConfig = outputConfig?.output?.[outputId] const visible = customConfig?.visible ?? !hasLink this.outputVisibility.push(visible) @@ -749,7 +742,7 @@ export class GroupNodeConfig { } } - let name: string = String(label ?? `output_${outputId}`) + let name: string = label ?? `output_${outputId}` if (name in seenOutputs) { const prefix = `${node.title ?? node.type} ` name = `${prefix}${label ?? outputId}` @@ -1096,7 +1089,7 @@ const ext: ComfyExtension = { const instanceIndicesByGroup = new Map() const groupTypePrefix = `${PREFIX}${SEPARATOR}` for (const [nodeIndex, n] of graphData.nodes.entries()) { - const type = String(n.type ?? '') + const type = n.type ?? '' if (!type.startsWith(groupTypePrefix)) continue const groupName = type.slice(groupTypePrefix.length) const indices = instanceIndicesByGroup.get(groupName) ?? [] diff --git a/src/extensions/core/groupOptions.test.ts b/src/extensions/core/groupOptions.test.ts index b4c2816c55a..8e9abb670f2 100644 --- a/src/extensions/core/groupOptions.test.ts +++ b/src/extensions/core/groupOptions.test.ts @@ -167,7 +167,7 @@ describe('Comfy.GroupOptions canvas menu', () => { const item = items.find((entry) => entry?.content === label) const menuElement: ContextMenuDivElement = document.createElement('div') - item?.callback?.call(menuElement) + void item?.callback?.call(menuElement) expect(nodes.map((node) => node.mode)).toEqual([expected, expected]) expect(graphChange).toHaveBeenCalledTimes(nodes.length) diff --git a/src/extensions/core/groupOptions.ts b/src/extensions/core/groupOptions.ts index 99b93cb57ef..29a123c532d 100644 --- a/src/extensions/core/groupOptions.ts +++ b/src/extensions/core/groupOptions.ts @@ -2,12 +2,8 @@ import type { IContextMenuValue, Positionable } from '@/lib/litegraph/src/interfaces' -import { - LGraphCanvas, - LGraphEventMode, - LGraphGroup, - type LGraphNode -} from '@/lib/litegraph/src/litegraph' +import { LGraphEventMode, LGraphGroup } from '@/lib/litegraph/src/litegraph' +import type { LGraphNode, LGraphCanvas } from '@/lib/litegraph/src/litegraph' import { useSettingStore } from '@/platform/settings/settingStore' import type { ComfyExtension } from '@/types/comfy' diff --git a/src/extensions/core/load3d.test.ts b/src/extensions/core/load3d.test.ts index 2c327923ec2..a3bd784e32f 100644 --- a/src/extensions/core/load3d.test.ts +++ b/src/extensions/core/load3d.test.ts @@ -646,7 +646,7 @@ describe('Comfy.Preview3D.onNodeOutputsUpdated', () => { const node = makePreview3DNode() getNodeByLocatorIdMock.mockReturnValue(node) - preview3DExt.onNodeOutputsUpdated!({ + preview3DExt.onNodeOutputsUpdated({ '7': { result: ['sub\\nested\\mesh.glb', { position: [1, 2, 3] }] } } as never) @@ -667,7 +667,7 @@ describe('Comfy.Preview3D.onNodeOutputsUpdated', () => { const node = makePreview3DNode() getNodeByLocatorIdMock.mockReturnValue(node) - preview3DExt.onNodeOutputsUpdated!({ + preview3DExt.onNodeOutputsUpdated({ '7': { result: [undefined] } } as never) @@ -679,7 +679,7 @@ describe('Comfy.Preview3D.onNodeOutputsUpdated', () => { const { preview3DExt } = await loadExtensionsFresh() getNodeByLocatorIdMock.mockReturnValue(null) - preview3DExt.onNodeOutputsUpdated!({ + preview3DExt.onNodeOutputsUpdated({ '7': { result: ['mesh.glb'] } } as never) @@ -691,7 +691,7 @@ describe('Comfy.Preview3D.onNodeOutputsUpdated', () => { const node = makePreview3DNode({ comfyClass: 'Load3D' }) getNodeByLocatorIdMock.mockReturnValue(node) - preview3DExt.onNodeOutputsUpdated!({ + preview3DExt.onNodeOutputsUpdated({ '7': { result: ['mesh.glb'] } } as never) @@ -706,7 +706,7 @@ describe('Comfy.Preview3D.onNodeOutputsUpdated', () => { }) getNodeByLocatorIdMock.mockReturnValue(node) - preview3DExt.onNodeOutputsUpdated!({ + preview3DExt.onNodeOutputsUpdated({ '7': { result: ['mesh.glb', { position: [9, 9, 9] }, 'new-bg.png'] } @@ -729,7 +729,7 @@ describe('Comfy.Save3DAdvanced.onNodeOutputsUpdated', () => { const node = makePreview3DAdvancedNode({ comfyClass: 'Save3DAdvanced' }) getNodeByLocatorIdMock.mockReturnValue(node) - save3DAdvancedExt.onNodeOutputsUpdated!({ + save3DAdvancedExt.onNodeOutputsUpdated({ '7': { result: ['3d\\ComfyUI_00001.glb'] } } as never) @@ -746,7 +746,7 @@ describe('Comfy.Save3DAdvanced.onNodeOutputsUpdated', () => { const node = makePreview3DAdvancedNode({ comfyClass: 'Preview3DAdvanced' }) getNodeByLocatorIdMock.mockReturnValue(node) - save3DAdvancedExt.onNodeOutputsUpdated!({ + save3DAdvancedExt.onNodeOutputsUpdated({ '7': { result: ['mesh.glb'] } } as never) diff --git a/src/extensions/core/load3d.ts b/src/extensions/core/load3d.ts index 6c476dd7ffd..f703216eaee 100644 --- a/src/extensions/core/load3d.ts +++ b/src/extensions/core/load3d.ts @@ -3,7 +3,6 @@ import { nextTick } from 'vue' import Load3D from '@/components/load3d/Load3D.vue' import Load3DViewerContent from '@/components/load3d/Load3dViewerContent.vue' import { - type Load3dCachedOutput, getLoad3dOutputCache, isLoad3dSceneDirty, markLoad3dSceneDirty, @@ -11,6 +10,7 @@ import { setLoad3dOutputCache, useLoad3d } from '@/composables/useLoad3d' +import type { Load3dCachedOutput } from '@/composables/useLoad3d' import { createExportMenuItems } from '@/extensions/core/load3d/exportMenuHelper' import type { CameraConfig, @@ -95,7 +95,7 @@ async function handleModelUpload(files: FileList, node: LGraphNode) { useLoad3d(node).waitForLoad3d((load3d) => { try { - load3d.loadModel(modelUrl) + void load3d.loadModel(modelUrl) } catch (error) { useToastStore().addAlert(t('toastMessages.failedToLoadModel')) } @@ -504,7 +504,7 @@ function applyPreview3DOutput( silentOnNotFound: true }) - if (bgImagePath) load3d.setBackgroundImage(bgImagePath) + if (bgImagePath) void load3d.setBackgroundImage(bgImagePath) if (extrinsics && intrinsics) { const targetGeneration = load3d.currentLoadGeneration @@ -656,7 +656,7 @@ useExtensionService().registerExtension({ config.configure(settings) if (bgImagePath) { - load3d.setBackgroundImage(bgImagePath) + void load3d.setBackgroundImage(bgImagePath) } if (filePath && extrinsics && intrinsics) { diff --git a/src/extensions/core/load3d/CameraManager.ts b/src/extensions/core/load3d/CameraManager.ts index 67021005f20..ffcb1de77c0 100644 --- a/src/extensions/core/load3d/CameraManager.ts +++ b/src/extensions/core/load3d/CameraManager.ts @@ -1,11 +1,11 @@ import * as THREE from 'three' -import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls' +import type { OrbitControls } from 'three/examples/jsm/controls/OrbitControls' -import { - type CameraManagerInterface, - type CameraState, - type CameraType, - type EventManagerInterface +import type { + CameraManagerInterface, + CameraState, + CameraType, + EventManagerInterface } from './interfaces' function resolveIncomingCustomUp(state: CameraState): THREE.Vector3 | null { diff --git a/src/extensions/core/load3d/ControlsManager.ts b/src/extensions/core/load3d/ControlsManager.ts index 8defe85bc56..3c5daf38b53 100644 --- a/src/extensions/core/load3d/ControlsManager.ts +++ b/src/extensions/core/load3d/ControlsManager.ts @@ -1,4 +1,4 @@ -import * as THREE from 'three' +import type * as THREE from 'three' import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls' import type { ControlsManagerInterface } from './interfaces' diff --git a/src/extensions/core/load3d/EventManager.ts b/src/extensions/core/load3d/EventManager.ts index 3a0a747e956..b3c31d55c73 100644 --- a/src/extensions/core/load3d/EventManager.ts +++ b/src/extensions/core/load3d/EventManager.ts @@ -1,4 +1,4 @@ -import { type EventCallback, type EventManagerInterface } from './interfaces' +import type { EventCallback, EventManagerInterface } from './interfaces' export class EventManager implements EventManagerInterface { private listeners: Record = {} @@ -18,7 +18,7 @@ export class EventManager implements EventManagerInterface { } } - emitEvent(event: string, data: T): void { + emitEvent(event: string, data: unknown): void { if (this.listeners[event]) { this.listeners[event].forEach((callback) => callback(data)) } diff --git a/src/extensions/core/load3d/GizmoManager.test.ts b/src/extensions/core/load3d/GizmoManager.test.ts index 3b24834dc6f..5dc1b7dbe43 100644 --- a/src/extensions/core/load3d/GizmoManager.test.ts +++ b/src/extensions/core/load3d/GizmoManager.test.ts @@ -1,4 +1,5 @@ import * as THREE from 'three' +import type { OrbitControls } from 'three/examples/jsm/controls/OrbitControls' import { beforeEach, describe, expect, it, vi } from 'vitest' import { GizmoManager } from './GizmoManager' @@ -67,9 +68,7 @@ vi.mock('three/examples/jsm/controls/OrbitControls', () => { }) function makeMockOrbitControls() { - return { enabled: true } as unknown as InstanceType< - typeof import('three/examples/jsm/controls/OrbitControls').OrbitControls - > + return { enabled: true } as unknown as OrbitControls } describe('GizmoManager', () => { diff --git a/src/extensions/core/load3d/GizmoManager.ts b/src/extensions/core/load3d/GizmoManager.ts index 3c7edf56cab..5ac1fb669cc 100644 --- a/src/extensions/core/load3d/GizmoManager.ts +++ b/src/extensions/core/load3d/GizmoManager.ts @@ -1,7 +1,7 @@ import * as THREE from 'three' import { TransformControls } from 'three/examples/jsm/controls/TransformControls' -import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls' +import type { OrbitControls } from 'three/examples/jsm/controls/OrbitControls' import type { GizmoMode, Model3DTransform } from './interfaces' import type { PointerNdcSource } from './load3dViewport' diff --git a/src/extensions/core/load3d/LightingManager.ts b/src/extensions/core/load3d/LightingManager.ts index fc65e34ee39..852d17884fe 100644 --- a/src/extensions/core/load3d/LightingManager.ts +++ b/src/extensions/core/load3d/LightingManager.ts @@ -1,8 +1,8 @@ import * as THREE from 'three' -import { - type EventManagerInterface, - type LightingManagerInterface +import type { + EventManagerInterface, + LightingManagerInterface } from './interfaces' export class LightingManager implements LightingManagerInterface { diff --git a/src/extensions/core/load3d/Load3DConfiguration.ts b/src/extensions/core/load3d/Load3DConfiguration.ts index c3822b95d7e..18774838d95 100644 --- a/src/extensions/core/load3d/Load3DConfiguration.ts +++ b/src/extensions/core/load3d/Load3DConfiguration.ts @@ -1,5 +1,5 @@ import { LOAD3D_NONE_MODEL } from '@/extensions/core/load3d/constants' -import Load3d from '@/extensions/core/load3d/Load3d' +import type Load3d from '@/extensions/core/load3d/Load3d' import Load3dUtils from '@/extensions/core/load3d/Load3dUtils' import type { CameraConfig, @@ -184,7 +184,7 @@ class Load3DConfiguration { backgroundColor: '#' + useSettingStore().get('Comfy.Load3D.BackgroundColor'), backgroundImage: '' - } as SceneConfig + } } private loadCameraConfig(): CameraConfig { @@ -195,7 +195,7 @@ class Load3DConfiguration { return { cameraType: useSettingStore().get('Comfy.Load3D.CameraType'), fov: 35 - } as CameraConfig + } } private loadLightConfig(): LightConfig { @@ -211,13 +211,13 @@ class Load3DConfiguration { return { intensity: saved.intensity ?? - (useSettingStore().get('Comfy.Load3D.LightIntensity') as number), + useSettingStore().get('Comfy.Load3D.LightIntensity'), hdri: { ...hdriDefaults, ...(saved.hdri ?? {}) } } } return { - intensity: useSettingStore().get('Comfy.Load3D.LightIntensity') as number, + intensity: useSettingStore().get('Comfy.Load3D.LightIntensity'), hdri: hdriDefaults } } diff --git a/src/extensions/core/load3d/Load3d.test.ts b/src/extensions/core/load3d/Load3d.test.ts index bc482261bce..b2c883bc96a 100644 --- a/src/extensions/core/load3d/Load3d.test.ts +++ b/src/extensions/core/load3d/Load3d.test.ts @@ -993,7 +993,7 @@ describe('Load3d', () => { const mocks = setupLoadInternal() await ctx.load3d.loadModel('a.glb') - ;(ctx.cameraManager.reset as ReturnType).mockClear() + ctx.cameraManager.reset.mockClear() mocks.getCameraState.mockClear() mocks.setCameraState.mockClear() @@ -1014,7 +1014,7 @@ describe('Load3d', () => { })) // First load (active type stays perspective per the default mock). await ctx.load3d.loadModel('a.glb') - ;(ctx.cameraManager.toggleCamera as ReturnType).mockClear() + ctx.cameraManager.toggleCamera.mockClear() await ctx.load3d.loadModel('b.glb') @@ -1028,7 +1028,7 @@ describe('Load3d', () => { const mocks = setupLoadInternal() await ctx.load3d.loadModel('a.glb') ctx.load3d.clearModel() - ;(ctx.cameraManager.reset as ReturnType).mockClear() + ctx.cameraManager.reset.mockClear() mocks.getCameraState.mockClear() await ctx.load3d.loadModel('b.glb') diff --git a/src/extensions/core/load3d/Load3d.ts b/src/extensions/core/load3d/Load3d.ts index b484eb6702e..8bcd218fc91 100644 --- a/src/extensions/core/load3d/Load3d.ts +++ b/src/extensions/core/load3d/Load3d.ts @@ -10,7 +10,8 @@ import { DEFAULT_MODEL_CAPABILITIES } from './ModelAdapter' import type { AdapterRef, ModelAdapterCapabilities } from './ModelAdapter' import type { RecordingManager } from './RecordingManager' import type { SceneModelManager } from './SceneModelManager' -import { Viewport3d, type Viewport3dDeps } from './Viewport3d' +import { Viewport3d } from './Viewport3d' +import type { Viewport3dDeps } from './Viewport3d' import { computeCameraFromMatrices } from './cameraFromMatrices' import { DIRECT_EXPORT_FORMATS } from './constants' import type { @@ -337,7 +338,9 @@ class Load3d extends Viewport3d { if (this.loadingPromise) { try { await this.loadingPromise - } catch (e) {} + } catch { + // Superseded load: the previous failure is reported by its own caller + } } this.loadingPromise = this._loadModelInternal( @@ -354,7 +357,9 @@ class Load3d extends Viewport3d { last = this.loadingPromise try { await last - } catch (e) {} + } catch { + // Only idleness matters here; load failures surface via loadModel + } } } diff --git a/src/extensions/core/load3d/LoaderManager.test.ts b/src/extensions/core/load3d/LoaderManager.test.ts index c2d7eb800a0..509fafd9429 100644 --- a/src/extensions/core/load3d/LoaderManager.test.ts +++ b/src/extensions/core/load3d/LoaderManager.test.ts @@ -7,6 +7,7 @@ import type { ModelManagerInterface } from './interfaces' import { LoaderManager } from './LoaderManager' +import type * as ModelAdapterModule from './ModelAdapter' import type { ModelAdapter, ModelAdapterCapabilities, @@ -103,7 +104,7 @@ vi.mock('./SplatModelAdapter', () => ({ vi.mock('./ModelAdapter', async () => { const actual = - await vi.importActual('./ModelAdapter') + await vi.importActual('./ModelAdapter') return { ...actual, fetchModelData: fetchModelDataMock } }) @@ -135,9 +136,7 @@ function makeLoaderManager() { ) const internals = lm as unknown as LoaderManagerInternals const pick = (ext: string) => - internals.pickAdapter.call(lm, ext, () => - fetchModelDataMock() - ) as Promise + internals.pickAdapter.call(lm, ext, () => fetchModelDataMock()) return { lm, modelManager, eventManager, pick } } diff --git a/src/extensions/core/load3d/MeshModelAdapter.ts b/src/extensions/core/load3d/MeshModelAdapter.ts index 701d691c006..bf93d95333a 100644 --- a/src/extensions/core/load3d/MeshModelAdapter.ts +++ b/src/extensions/core/load3d/MeshModelAdapter.ts @@ -114,7 +114,7 @@ export class MeshModelAdapter implements ModelAdapter { MtlObjBridge.addMaterialsFromMtlLoader(materials) this.objLoader.setMaterials(materialsFromMtl) } catch { - console.log( + console.warn( 'No MTL file found or error loading it, continuing without materials' ) } diff --git a/src/extensions/core/load3d/ModelExporter.ts b/src/extensions/core/load3d/ModelExporter.ts index 9c1a3909ef5..6d340008713 100644 --- a/src/extensions/core/load3d/ModelExporter.ts +++ b/src/extensions/core/load3d/ModelExporter.ts @@ -1,5 +1,5 @@ import { FBXExporter } from '@comfyorg/fbx-exporter-three' -import * as THREE from 'three' +import type * as THREE from 'three' import { GLTFExporter } from 'three/examples/jsm/exporters/GLTFExporter' import { OBJExporter } from 'three/examples/jsm/exporters/OBJExporter' import { STLExporter } from 'three/examples/jsm/exporters/STLExporter' @@ -57,7 +57,6 @@ export class ModelExporter { originalURL?: string | null ): Promise { if (originalURL && ModelExporter.canUseDirectURL(originalURL, 'glb')) { - console.log('Using direct URL download for GLB') return ModelExporter.downloadFromURL(originalURL, filename) } @@ -97,7 +96,6 @@ export class ModelExporter { originalURL?: string | null ): Promise { if (originalURL && ModelExporter.canUseDirectURL(originalURL, 'obj')) { - console.log('Using direct URL download for OBJ') return ModelExporter.downloadFromURL(originalURL, filename) } @@ -161,7 +159,6 @@ export class ModelExporter { originalURL?: string | null ): Promise { if (originalURL && ModelExporter.canUseDirectURL(originalURL, 'stl')) { - console.log('Using direct URL download for STL') return ModelExporter.downloadFromURL(originalURL, filename) } diff --git a/src/extensions/core/load3d/PointCloudModelAdapter.ts b/src/extensions/core/load3d/PointCloudModelAdapter.ts index 290dd7d85c8..1416b7d323b 100644 --- a/src/extensions/core/load3d/PointCloudModelAdapter.ts +++ b/src/extensions/core/load3d/PointCloudModelAdapter.ts @@ -15,7 +15,7 @@ import type { MaterialMode } from './interfaces' import { FastPLYLoader } from './loader/FastPLYLoader' function getPLYEngine(): string { - return useSettingStore().get('Comfy.Load3D.PLYEngine') as string + return useSettingStore().get('Comfy.Load3D.PLYEngine') } const POINT_CLOUD_CAPABILITIES: ModelAdapterCapabilities = { diff --git a/src/extensions/core/load3d/RecordingManager.test.ts b/src/extensions/core/load3d/RecordingManager.test.ts index 752a1803d00..4af15b7a645 100644 --- a/src/extensions/core/load3d/RecordingManager.test.ts +++ b/src/extensions/core/load3d/RecordingManager.test.ts @@ -289,10 +289,7 @@ describe('RecordingManager', () => { const sprite = scene.children.find( (c) => c instanceof THREE.Sprite ) as THREE.Sprite - const disposeSpy = vi.spyOn( - sprite.material as THREE.SpriteMaterial, - 'dispose' - ) + const disposeSpy = vi.spyOn(sprite.material, 'dispose') manager.dispose() diff --git a/src/extensions/core/load3d/RecordingManager.ts b/src/extensions/core/load3d/RecordingManager.ts index a5ae79cdf41..5f48b77b0f5 100644 --- a/src/extensions/core/load3d/RecordingManager.ts +++ b/src/extensions/core/load3d/RecordingManager.ts @@ -2,7 +2,7 @@ import * as THREE from 'three' import { downloadBlob } from '@/base/common/downloadUtil' -import { type EventManagerInterface } from './interfaces' +import type { EventManagerInterface } from './interfaces' export class RecordingManager { private mediaRecorder: MediaRecorder | null = null @@ -254,8 +254,8 @@ export class RecordingManager { if (this.recordingIndicator) { this.scene.remove(this.recordingIndicator) - ;(this.recordingIndicator.material as THREE.SpriteMaterial).map?.dispose() - ;(this.recordingIndicator.material as THREE.SpriteMaterial).dispose() + this.recordingIndicator.material.map?.dispose() + this.recordingIndicator.material.dispose() } } } diff --git a/src/extensions/core/load3d/SceneManager.test.ts b/src/extensions/core/load3d/SceneManager.test.ts index c6af15f3418..e8b2fd59912 100644 --- a/src/extensions/core/load3d/SceneManager.test.ts +++ b/src/extensions/core/load3d/SceneManager.test.ts @@ -623,14 +623,7 @@ function makeSceneManager( const view = makeView(renderer, viewSize?.width, viewSize?.height) const camera = cameraOverride ?? new THREE.PerspectiveCamera() const eventManager = makeMockEventManager() - const manager = new SceneManager( - view, - () => camera, - vi.fn() as unknown as () => InstanceType< - typeof import('three/examples/jsm/controls/OrbitControls').OrbitControls - >, - eventManager - ) + const manager = new SceneManager(view, () => camera, vi.fn(), eventManager) return { manager, renderer, view, camera, eventManager } } diff --git a/src/extensions/core/load3d/SceneManager.ts b/src/extensions/core/load3d/SceneManager.ts index 4b669b0d02c..8d79055f7eb 100644 --- a/src/extensions/core/load3d/SceneManager.ts +++ b/src/extensions/core/load3d/SceneManager.ts @@ -1,14 +1,14 @@ import { SparkRenderer } from '@sparkjsdev/spark' import * as THREE from 'three' -import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls' +import type { OrbitControls } from 'three/examples/jsm/controls/OrbitControls' import type { RendererView } from '@/renderer/three/RendererView' import Load3dUtils from './Load3dUtils' -import { - type BackgroundRenderModeType, - type EventManagerInterface, - type SceneManagerInterface +import type { + BackgroundRenderModeType, + EventManagerInterface, + SceneManagerInterface } from './interfaces' export class SceneManager implements SceneManagerInterface { @@ -192,8 +192,8 @@ export class SceneManager implements SceneManagerInterface { let type = 'input' let pathParts = Load3dUtils.splitFilePath(uploadPath) - let subfolder = pathParts[0] - let filename = pathParts[1] + const subfolder = pathParts[0] + const filename = pathParts[1] if (subfolder === 'temp') { type = 'temp' diff --git a/src/extensions/core/load3d/SceneModelManager.test.ts b/src/extensions/core/load3d/SceneModelManager.test.ts index 4fc08b2b95a..ebadd03637e 100644 --- a/src/extensions/core/load3d/SceneModelManager.test.ts +++ b/src/extensions/core/load3d/SceneModelManager.test.ts @@ -525,7 +525,7 @@ describe('SceneModelManager', () => { await manager.setupModel(model) manager.originalModel = new THREE.BufferGeometry() - ;(manager.originalModel as THREE.BufferGeometry).setAttribute( + manager.originalModel.setAttribute( 'position', new THREE.Float32BufferAttribute([0, 0, 0, 1, 1, 1, 2, 2, 2], 3) ) diff --git a/src/extensions/core/load3d/SceneModelManager.ts b/src/extensions/core/load3d/SceneModelManager.ts index 4c41f817602..d0f276cc8f6 100644 --- a/src/extensions/core/load3d/SceneModelManager.ts +++ b/src/extensions/core/load3d/SceneModelManager.ts @@ -273,7 +273,7 @@ export class SceneModelManager implements ModelManagerInterface { child.material = this.clayMaterial break case 'original': - case 'pointCloud': + case 'pointCloud': { const originalMaterial = this.originalMaterials.get(child) if (originalMaterial) { child.material = originalMaterial @@ -290,6 +290,7 @@ export class SceneModelManager implements ModelManagerInterface { } } break + } } } }) diff --git a/src/extensions/core/load3d/SplatModelAdapter.test.ts b/src/extensions/core/load3d/SplatModelAdapter.test.ts index d7ad4b04d7b..bad256b6384 100644 --- a/src/extensions/core/load3d/SplatModelAdapter.test.ts +++ b/src/extensions/core/load3d/SplatModelAdapter.test.ts @@ -85,14 +85,12 @@ describe('SplatModelAdapter', () => { fileBytes: buf, fileName: 'scene.splat' }) - expect(result!.object).toBeInstanceOf(THREE.Group) - expect(result!.object.children).toHaveLength(1) - expect(result!.capabilities.lighting).toBe(false) + expect(result.object).toBeInstanceOf(THREE.Group) + expect(result.object.children).toHaveLength(1) + expect(result.capabilities.lighting).toBe(false) expect(ctx.setOriginalModel).toHaveBeenCalledTimes(1) - expect(ctx.setOriginalModel).toHaveBeenCalledWith( - result!.object.children[0] - ) + expect(ctx.setOriginalModel).toHaveBeenCalledWith(result.object.children[0]) }) it('rotates the splat 180° around X (OpenCV → three.js convention)', async () => { @@ -102,7 +100,7 @@ describe('SplatModelAdapter', () => { 'scene.splat' ) - const splat = result!.object.children[0] + const splat = result.object.children[0] expect(splat.quaternion.x).toBe(1) expect(splat.quaternion.y).toBe(0) expect(splat.quaternion.z).toBe(0) @@ -128,7 +126,7 @@ describe('SplatModelAdapter', () => { '/api/view?', 'scene.splat' ) - const group = result!.object + const group = result.object const splat = group.children[0] splat.position.set(10, 0, 0) @@ -161,7 +159,7 @@ describe('SplatModelAdapter', () => { 'scene.splat' ) - adapter.disposeModel(result!.object) + adapter.disposeModel(result.object) expect(splatMeshSpies.dispose).toHaveBeenCalledOnce() }) diff --git a/src/extensions/core/load3d/ViewHelperManager.test.ts b/src/extensions/core/load3d/ViewHelperManager.test.ts index c21d43a0cb6..4643547d67d 100644 --- a/src/extensions/core/load3d/ViewHelperManager.test.ts +++ b/src/extensions/core/load3d/ViewHelperManager.test.ts @@ -33,7 +33,7 @@ vi.mock('three/examples/jsm/helpers/ViewHelper', () => { public camera: THREE.Camera, public domElement: HTMLElement ) { - viewHelperInstances.push(this as unknown as MockViewHelperInstance) + viewHelperInstances.push(this) } } return { ViewHelper } diff --git a/src/extensions/core/load3d/ViewHelperManager.ts b/src/extensions/core/load3d/ViewHelperManager.ts index e63935fba71..c08b95b60cb 100644 --- a/src/extensions/core/load3d/ViewHelperManager.ts +++ b/src/extensions/core/load3d/ViewHelperManager.ts @@ -1,11 +1,11 @@ import * as THREE from 'three' -import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls' +import type { OrbitControls } from 'three/examples/jsm/controls/OrbitControls' import { ViewHelper } from 'three/examples/jsm/helpers/ViewHelper' -import { - type CameraState, - type EventManagerInterface, - type ViewHelperManagerInterface +import type { + CameraState, + EventManagerInterface, + ViewHelperManagerInterface } from './interfaces' export class ViewHelperManager implements ViewHelperManagerInterface { diff --git a/src/extensions/core/load3d/Viewport3d.test.ts b/src/extensions/core/load3d/Viewport3d.test.ts index e2d028b5c4c..791e0ab5c09 100644 --- a/src/extensions/core/load3d/Viewport3d.test.ts +++ b/src/extensions/core/load3d/Viewport3d.test.ts @@ -389,7 +389,7 @@ describe('Viewport3d', () => { x: rect.left, y: rect.top, toJSON: () => ({}) - } as DOMRect) + }) Object.assign(ctx.viewport, { view: { canvas } }) } diff --git a/src/extensions/core/load3d/constants.test.ts b/src/extensions/core/load3d/constants.test.ts index 32cc2e3582c..eeef0db96ce 100644 --- a/src/extensions/core/load3d/constants.test.ts +++ b/src/extensions/core/load3d/constants.test.ts @@ -22,7 +22,7 @@ describe('getExportFormatOptions', () => { ]) }) - it.each(['ply', 'spz', 'splat', 'ksplat'])( + it.for(['ply', 'spz', 'splat', 'ksplat'])( 'offers only the source format for direct-export type %s', (format) => { expect(getExportFormatOptions(format)).toEqual([ @@ -43,7 +43,7 @@ describe('Assets browser recognizes every Load3D-uploadable format', () => { // with the formats Load3D accepts. A format Load3D can load but the Assets // browser tags as 'other' gets no 3D preview and can't be opened in the // 3D viewer. - it.each([...SUPPORTED_EXTENSIONS])( + it.for([...SUPPORTED_EXTENSIONS])( 'classifies %s uploads as 3D media', (ext) => { expect(getMediaTypeFromFilename(`model${ext}`)).toBe('3D') diff --git a/src/extensions/core/load3d/createLoad3d.test.ts b/src/extensions/core/load3d/createLoad3d.test.ts index 7a7f9659724..4dffb99f303 100644 --- a/src/extensions/core/load3d/createLoad3d.test.ts +++ b/src/extensions/core/load3d/createLoad3d.test.ts @@ -1,3 +1,4 @@ +import type * as ThreeModule from 'three' import { beforeEach, describe, expect, it, vi } from 'vitest' import { DEFAULT_MODEL_CAPABILITIES } from './ModelAdapter' @@ -9,7 +10,7 @@ const { rendererCtor } = vi.hoisted(() => ({ })) vi.mock('three', async () => { - const actual = await vi.importActual('three') + const actual = await vi.importActual('three') return { ...actual, WebGLRenderer: class { @@ -217,15 +218,13 @@ describe('createLoad3d', () => { it('getBoundsFromAdapter returns null', () => { const instance = createLoad3d(createContainer()) as unknown as FakeLoad3d - expect( - instance.deps.modelManager.getBoundsFromAdapter({} as never) - ).toBeNull() + expect(instance.deps.modelManager.getBoundsFromAdapter({})).toBeNull() }) it('disposeModelViaAdapter is a no-op', () => { const instance = createLoad3d(createContainer()) as unknown as FakeLoad3d expect(() => - instance.deps.modelManager.disposeModelViaAdapter({} as never) + instance.deps.modelManager.disposeModelViaAdapter({}) ).not.toThrow() }) @@ -259,9 +258,7 @@ describe('createLoad3d', () => { const instance = withAdapter(makeAdapter({ computeBounds })) const model = { fake: 'model' } - const result = instance.deps.modelManager.getBoundsFromAdapter( - model as never - ) + const result = instance.deps.modelManager.getBoundsFromAdapter(model) expect(computeBounds).toHaveBeenCalledWith(model) expect(result).toBe('bbox-result') @@ -269,9 +266,7 @@ describe('createLoad3d', () => { it('getBoundsFromAdapter returns null when adapter has no computeBounds', () => { const instance = withAdapter(makeAdapter()) - expect( - instance.deps.modelManager.getBoundsFromAdapter({} as never) - ).toBeNull() + expect(instance.deps.modelManager.getBoundsFromAdapter({})).toBeNull() }) it('disposeModelViaAdapter delegates to adapter.disposeModel', () => { @@ -279,7 +274,7 @@ describe('createLoad3d', () => { const instance = withAdapter(makeAdapter({ disposeModel })) const model = { fake: 'model' } - instance.deps.modelManager.disposeModelViaAdapter(model as never) + instance.deps.modelManager.disposeModelViaAdapter(model) expect(disposeModel).toHaveBeenCalledWith(model) }) diff --git a/src/extensions/core/load3d/createLoad3d.ts b/src/extensions/core/load3d/createLoad3d.ts index 36c10cb55eb..7bb01eef042 100644 --- a/src/extensions/core/load3d/createLoad3d.ts +++ b/src/extensions/core/load3d/createLoad3d.ts @@ -28,10 +28,6 @@ function buildLoad3dDeps(container: HTMLElement): Load3dDeps { // without depending on construction order. const adapterRef = createAdapterRef() - let cameraManager: CameraManager - let controlsManager: ControlsManager - let gizmoManager: GizmoManager - const getActiveCamera = (): THREE.Camera => cameraManager.activeCamera const getControls = () => controlsManager.controls @@ -42,8 +38,11 @@ function buildLoad3dDeps(container: HTMLElement): Load3dDeps { eventManager ) - cameraManager = new CameraManager(renderer, eventManager) - controlsManager = new ControlsManager(container, cameraManager.activeCamera) + const cameraManager = new CameraManager(renderer, eventManager) + const controlsManager = new ControlsManager( + container, + cameraManager.activeCamera + ) cameraManager.setControls(controlsManager.controls) const lightingManager = new LightingManager(sceneManager.scene, eventManager) @@ -87,7 +86,7 @@ function buildLoad3dDeps(container: HTMLElement): Load3dDeps { ) const animationManager = new AnimationManager(eventManager) - gizmoManager = new GizmoManager( + const gizmoManager = new GizmoManager( sceneManager.scene, container, controlsManager.controls, diff --git a/src/extensions/core/load3d/createViewport3d.ts b/src/extensions/core/load3d/createViewport3d.ts index fd0e1eddccc..db411658d42 100644 --- a/src/extensions/core/load3d/createViewport3d.ts +++ b/src/extensions/core/load3d/createViewport3d.ts @@ -17,9 +17,6 @@ function buildViewport3dDeps(container: HTMLElement): Viewport3dDeps { const renderer = view.renderer const eventManager = new EventManager() - let cameraManager: CameraManager - let controlsManager: ControlsManager - const getActiveCamera = (): THREE.Camera => cameraManager.activeCamera const getControls = () => controlsManager.controls @@ -30,8 +27,11 @@ function buildViewport3dDeps(container: HTMLElement): Viewport3dDeps { eventManager ) - cameraManager = new CameraManager(renderer, eventManager) - controlsManager = new ControlsManager(container, cameraManager.activeCamera) + const cameraManager = new CameraManager(renderer, eventManager) + const controlsManager = new ControlsManager( + container, + cameraManager.activeCamera + ) cameraManager.setControls(controlsManager.controls) const lightingManager = new LightingManager(sceneManager.scene, eventManager) diff --git a/src/extensions/core/load3d/exportMenuHelper.ts b/src/extensions/core/load3d/exportMenuHelper.ts index f9c24f23712..6776e37c751 100644 --- a/src/extensions/core/load3d/exportMenuHelper.ts +++ b/src/extensions/core/load3d/exportMenuHelper.ts @@ -1,7 +1,7 @@ import { t } from '@/i18n' import type { IContextMenuValue } from '@/lib/litegraph/src/interfaces' import { useToastStore } from '@/platform/updates/common/toastStore' -import Load3d from '@/extensions/core/load3d/Load3d' +import type Load3d from '@/extensions/core/load3d/Load3d' import { LiteGraph } from '@/lib/litegraph/src/litegraph' const EXPORT_FORMATS = [ diff --git a/src/extensions/core/load3d/interfaces.ts b/src/extensions/core/load3d/interfaces.ts index 5ebf637f236..d427809a592 100644 --- a/src/extensions/core/load3d/interfaces.ts +++ b/src/extensions/core/load3d/interfaces.ts @@ -191,7 +191,7 @@ export interface ViewHelperManagerInterface extends BaseManager { export interface EventManagerInterface { addEventListener(event: string, callback: EventCallback): void removeEventListener(event: string, callback: EventCallback): void - emitEvent(event: string, data: T): void + emitEvent(event: string, data: unknown): void } export interface AnimationManagerInterface extends BaseManager { diff --git a/src/extensions/core/load3d/load3dSerialize.test.ts b/src/extensions/core/load3d/load3dSerialize.test.ts index 6e07b4b2b4a..ae99489da39 100644 --- a/src/extensions/core/load3d/load3dSerialize.test.ts +++ b/src/extensions/core/load3d/load3dSerialize.test.ts @@ -19,7 +19,7 @@ const baseCameraState: CameraState = { function makeLoad3d({ cameraType = 'perspective', fov = 35, - modelInfo = { transform: { position: [0, 0, 0] } } as unknown + modelInfo = { transform: { position: [0, 0, 0] } } }: { cameraType?: string fov?: number diff --git a/src/extensions/core/load3dLazy.test.ts b/src/extensions/core/load3dLazy.test.ts index 06ca23e813e..87661dde18e 100644 --- a/src/extensions/core/load3dLazy.test.ts +++ b/src/extensions/core/load3dLazy.test.ts @@ -109,7 +109,7 @@ describe('load3dLazy', () => { input: { required: { model_file: ['STRING', {}] } } - } as Partial) + }) await hook({} as typeof LGraphNode, nodeData) @@ -126,7 +126,7 @@ describe('load3dLazy', () => { input: { required: { model_file: ['STRING', {}] } } - } as Partial) + }) await hook({} as typeof LGraphNode, nodeData) @@ -141,7 +141,7 @@ describe('load3dLazy', () => { const { hook } = await loadLazyExtensionFresh() const nodeData = makeNodeDef('Load3D', { input: { required: {} } - } as Partial) + }) await expect( hook({} as typeof LGraphNode, nodeData) @@ -154,7 +154,7 @@ describe('load3dLazy', () => { input: { required: { model_file: ['STRING', { existing: true }] } } - } as Partial) + }) await hook({} as typeof LGraphNode, nodeData) diff --git a/src/extensions/core/maskeditor.ts b/src/extensions/core/maskeditor.ts index 550bec00a67..2bc59f3a435 100644 --- a/src/extensions/core/maskeditor.ts +++ b/src/extensions/core/maskeditor.ts @@ -24,7 +24,7 @@ function openMaskEditor(node: LGraphNode): void { // Open mask editor from clipspace (for plugin compatibility) // This is called when ComfyApp.open_maskeditor() is invoked without arguments function openMaskEditorFromClipspace(): void { - const node = ComfyApp.clipspace_return_node as LGraphNode | null + const node = ComfyApp.clipspace_return_node if (!node) { console.error('[MaskEditor] No clipspace_return_node found') return diff --git a/src/extensions/core/nodeTemplates.ts b/src/extensions/core/nodeTemplates.ts index 59c4a882ed0..9bbb8c78885 100644 --- a/src/extensions/core/nodeTemplates.ts +++ b/src/extensions/core/nodeTemplates.ts @@ -45,7 +45,7 @@ class ManageTemplates extends ComfyDialog { constructor() { super() - this.load().then((v) => { + void this.load().then((v) => { this.templates = v }) @@ -64,7 +64,7 @@ class ManageTemplates extends ComfyDialog { style: { display: 'none' }, parent: document.body, onchange: () => this.importAll() - }) as HTMLInputElement + }) } override createButtons() { @@ -100,7 +100,9 @@ class ManageTemplates extends ComfyDialog { if (res.status === 200) { try { templates = await res.json() - } catch (error) {} + } catch { + // Malformed stored templates: fall back to the empty list below + } } else if (res.status !== 404) { console.error(res.status + ' ' + res.statusText) } @@ -197,7 +199,7 @@ class ManageTemplates extends ComfyDialog { // @ts-expect-error fixme ts strict error .forEach((el: HTMLElement, i) => { // @ts-expect-error fixme ts strict error - var prev_i = Number.parseInt(el.dataset.id) + const prev_i = Number.parseInt(el.dataset.id) if (el == this.draggedEl && prev_i != i) { this.templates.splice( @@ -208,14 +210,14 @@ class ManageTemplates extends ComfyDialog { } el.dataset.id = i.toString() }) - this.store() + void this.store() }, // @ts-expect-error fixme ts strict error ondragover: (e) => { e.preventDefault() if (e.currentTarget == this.draggedEl) return - let rect = e.currentTarget.getBoundingClientRect() + const rect = e.currentTarget.getBoundingClientRect() if (e.clientY > rect.top + rect.height / 2) { e.currentTarget.parentNode.insertBefore( this.draggedEl, @@ -256,15 +258,15 @@ class ManageTemplates extends ComfyDialog { onchange: (e) => { // @ts-expect-error fixme ts strict error clearTimeout(this.saveVisualCue) - var el = e.target - var row = el.parentNode.parentNode + const el = e.target + const row = el.parentNode.parentNode this.templates[row.dataset.id].name = el.value.trim() || 'untitled' - this.store() + void this.store() el.style.backgroundColor = 'rgb(40, 95, 40)' el.style.transitionDuration = '0s' - // @ts-expect-error - // In browser env the return value is number. + // @ts-expect-error: setTimeout is typed as the Node + // overload here; in the browser it returns a number. this.saveVisualCue = setTimeout(function () { el.style.transitionDuration = '.7s' el.style.backgroundColor = 'var(--comfy-input-bg)' @@ -272,7 +274,7 @@ class ManageTemplates extends ComfyDialog { }, // @ts-expect-error fixme ts strict error onkeypress: (e) => { - var el = e.target + const el = e.target // @ts-expect-error fixme ts strict error clearTimeout(this.saveVisualCue) el.style.transitionDuration = '0s' @@ -311,9 +313,9 @@ class ManageTemplates extends ComfyDialog { const item = e.target.parentNode.parentNode item.parentNode.removeChild(item) this.templates.splice(item.dataset.id * 1, 1) - this.store() + void this.store() // update the rows index, setTimeout ensures that the list is updated - var that = this + const that = this setTimeout(function () { that.element .querySelectorAll('.templateManagerRow') @@ -365,7 +367,7 @@ const ext: ComfyExtension = { }) if (!name?.trim()) return - clipboardAction(() => { + void clipboardAction(() => { app.canvas.copyToClipboard() const data = localStorage.getItem('litegrapheditor_clipboard') @@ -373,7 +375,7 @@ const ext: ComfyExtension = { name, data: data || '{}' }) - manage.store() + void manage.store() }) } }) @@ -383,7 +385,7 @@ const ext: ComfyExtension = { return { content: template.name, callback: () => { - clipboardAction(() => { + void clipboardAction(() => { let data: { reroutes?: unknown } try { data = JSON.parse(template.data) diff --git a/src/extensions/core/noteNode.ts b/src/extensions/core/noteNode.ts index d26e1e317c2..ccef6fb81de 100644 --- a/src/extensions/core/noteNode.ts +++ b/src/extensions/core/noteNode.ts @@ -1,5 +1,8 @@ -import { LGraphCanvas, LiteGraph } from '@/lib/litegraph/src/litegraph' -import { LGraphNode } from '@/lib/litegraph/src/litegraph' +import { + LGraphCanvas, + LiteGraph, + LGraphNode +} from '@/lib/litegraph/src/litegraph' import { app } from '../../scripts/app' import { ComfyWidgets } from '../../scripts/widgets' diff --git a/src/extensions/core/rerouteNode.ts b/src/extensions/core/rerouteNode.ts index add61ed2635..ebdc6fe2fe7 100644 --- a/src/extensions/core/rerouteNode.ts +++ b/src/extensions/core/rerouteNode.ts @@ -79,7 +79,7 @@ app.registerExtension({ // Find root input let currentNode: RerouteNode | null = this - let updateNodes: RerouteNode[] = [] + const updateNodes: RerouteNode[] = [] let inputType = null let inputNode = null while (currentNode) { @@ -106,7 +106,6 @@ app.registerExtension({ } } else { // This path has no input node - currentNode = null break } } diff --git a/src/extensions/core/saveImageExtraOutput.test.ts b/src/extensions/core/saveImageExtraOutput.test.ts index 79e7cf163a0..8451e9e5143 100644 --- a/src/extensions/core/saveImageExtraOutput.test.ts +++ b/src/extensions/core/saveImageExtraOutput.test.ts @@ -72,7 +72,7 @@ describe('Comfy.SaveImageExtraOutput', () => { app.graph = graph }) - it.each([ + it.for([ 'SaveImage', 'SaveImageAdvanced', 'SaveSVGNode', diff --git a/src/extensions/core/saveImageExtraOutput.ts b/src/extensions/core/saveImageExtraOutput.ts index 5ac24b7ae6b..f108be50b45 100644 --- a/src/extensions/core/saveImageExtraOutput.ts +++ b/src/extensions/core/saveImageExtraOutput.ts @@ -38,11 +38,8 @@ app.registerExtension({ if (saveNodeTypes.has(nodeData.name)) { const onNodeCreated = nodeType.prototype.onNodeCreated // When the SaveImage node is created we want to override the serialization of the output name widget to run our S&R - nodeType.prototype.onNodeCreated = function () { - const r = onNodeCreated - ? // @ts-expect-error fixme ts strict error - onNodeCreated.apply(this, arguments) - : undefined + nodeType.prototype.onNodeCreated = function (...args) { + const r = onNodeCreated ? onNodeCreated.apply(this, args) : undefined // @ts-expect-error fixme ts strict error const widget = this.widgets.find((w) => w.name === 'filename_prefix') @@ -57,11 +54,8 @@ app.registerExtension({ } else { // When any other node is created add a property to alias the node const onNodeCreated = nodeType.prototype.onNodeCreated - nodeType.prototype.onNodeCreated = function () { - const r = onNodeCreated - ? // @ts-expect-error fixme ts strict error - onNodeCreated.apply(this, arguments) - : undefined + nodeType.prototype.onNodeCreated = function (...args) { + const r = onNodeCreated ? onNodeCreated.apply(this, args) : undefined if (!this.properties || !('Node name for S&R' in this.properties)) { this.addProperty('Node name for S&R', this.constructor.type, 'string') diff --git a/src/extensions/core/saveMesh.test.ts b/src/extensions/core/saveMesh.test.ts index 8c7c0a7d543..4ae9993da6c 100644 --- a/src/extensions/core/saveMesh.test.ts +++ b/src/extensions/core/saveMesh.test.ts @@ -262,7 +262,7 @@ describe('Comfy.SaveGLB.onNodeOutputsUpdated', () => { const node = makeNode() getNodeByLocatorIdMock.mockReturnValue(node) - ext.onNodeOutputsUpdated!({ + ext.onNodeOutputsUpdated({ '7': { '3d': [{ filename: 'mesh.glb', subfolder: 'sub', type: 'output' }] } @@ -284,7 +284,7 @@ describe('Comfy.SaveGLB.onNodeOutputsUpdated', () => { const node = makeNode() getNodeByLocatorIdMock.mockReturnValue(node) - ext.onNodeOutputsUpdated!({ '7': {} } as never) + ext.onNodeOutputsUpdated({ '7': {} } as never) expect(getNodeByLocatorIdMock).not.toHaveBeenCalled() expect(configureForSaveMeshMock).not.toHaveBeenCalled() @@ -294,7 +294,7 @@ describe('Comfy.SaveGLB.onNodeOutputsUpdated', () => { const ext = await loadSaveMeshExtensionFresh() getNodeByLocatorIdMock.mockReturnValue(null) - ext.onNodeOutputsUpdated!({ + ext.onNodeOutputsUpdated({ '7': { '3d': [{ filename: 'mesh.glb', subfolder: 'sub', type: 'output' }] } @@ -308,7 +308,7 @@ describe('Comfy.SaveGLB.onNodeOutputsUpdated', () => { const node = makeNode({ comfyClass: 'Preview3D' }) getNodeByLocatorIdMock.mockReturnValue(node) - ext.onNodeOutputsUpdated!({ + ext.onNodeOutputsUpdated({ '7': { '3d': [{ filename: 'mesh.glb', subfolder: 'sub', type: 'output' }] } @@ -330,7 +330,7 @@ describe('Comfy.SaveGLB.onNodeOutputsUpdated', () => { ).value = 'sub/mesh.glb' getNodeByLocatorIdMock.mockReturnValue(node) - ext.onNodeOutputsUpdated!({ + ext.onNodeOutputsUpdated({ '7': { '3d': [{ filename: 'mesh.glb', subfolder: 'sub', type: 'output' }] } diff --git a/src/extensions/core/simpleTouchSupport.ts b/src/extensions/core/simpleTouchSupport.ts index 67215f47198..716a70189a3 100644 --- a/src/extensions/core/simpleTouchSupport.ts +++ b/src/extensions/core/simpleTouchSupport.ts @@ -120,7 +120,7 @@ app.registerExtension({ touchZooming = true LiteGraph.closeAllContextMenus(window) - // @ts-expect-error + // @ts-expect-error: search_box is not declared on LGraphCanvas app.canvas.search_box?.close() const newTouchDist = getMultiTouchPos(e) @@ -154,8 +154,8 @@ app.registerExtension({ center.clientX / scale - app.canvas.ds.offset[0], center.clientY / scale - app.canvas.ds.offset[1] ] - var oldCenter = convertScaleToOffset(oldScale) - var newCenter = convertScaleToOffset(newScale) + const oldCenter = convertScaleToOffset(oldScale) + const newCenter = convertScaleToOffset(newScale) app.canvas.ds.offset[0] += newX + newCenter[0] - oldCenter[0] app.canvas.ds.offset[1] += newY + newCenter[1] - oldCenter[1] diff --git a/src/extensions/core/slotDefaults.ts b/src/extensions/core/slotDefaults.ts index 165dfa014f0..36a594f9ec1 100644 --- a/src/extensions/core/slotDefaults.ts +++ b/src/extensions/core/slotDefaults.ts @@ -42,15 +42,15 @@ app.registerExtension({ slot_types_default_out: {}, slot_types_default_in: {}, async beforeRegisterNodeDef(this: SlotDefaultsExtension, nodeType, nodeData) { - var nodeId = nodeData.name + const nodeId = nodeData.name const inputs = nodeData['input']?.['required'] //only show required inputs to reduce the mess also not logical to create node with optional inputs for (const inputKey in inputs) { - var input = inputs[inputKey] + const input = inputs[inputKey] if (typeof input[0] !== 'string') continue - var type = input[0] + const type = input[0] if (type in ComfyWidgets) { - var customProperties = input[1] + const customProperties = input[1] if (!customProperties?.forceInput) continue //ignore widgets that don't force input } @@ -72,7 +72,7 @@ app.registerExtension({ ) } - var outputs = nodeData['output'] ?? [] + const outputs = nodeData['output'] ?? [] for (const el of outputs) { const type = el as string if (!(type in this.slot_types_default_in)) { @@ -94,7 +94,7 @@ app.registerExtension({ } } - var maxNum = this.suggestionsNumber?.value + const maxNum = this.suggestionsNumber?.value this.setDefaults(maxNum) }, setDefaults(this: SlotDefaultsExtension, maxNum?: number | null) { diff --git a/src/extensions/core/uploadAudio.ts b/src/extensions/core/uploadAudio.ts index 159b5b9eaf2..64b06f43002 100644 --- a/src/extensions/core/uploadAudio.ts +++ b/src/extensions/core/uploadAudio.ts @@ -19,7 +19,7 @@ import type { NodeExecutionOutput } from '@/schemas/apiSchema' import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' import type { DOMWidget } from '@/scripts/domWidget' import { useAudioService } from '@/services/audioService' -import { type NodeLocatorId } from '@/types' +import type { NodeLocatorId } from '@/types' import { widgetId } from '@/types/widgetId' import { getNodeByLocatorId } from '@/utils/graphTraversalUtil' @@ -237,9 +237,8 @@ app.registerExtension({ // Load saved audio file widget values if restoring from workflow const onGraphConfigured = node.onGraphConfigured - node.onGraphConfigured = function () { - // @ts-expect-error fixme ts strict error - onGraphConfigured?.apply(this, arguments) + node.onGraphConfigured = function (...args) { + onGraphConfigured?.apply(this, args) onAudioWidgetUpdate() } @@ -429,7 +428,9 @@ app.registerExtension({ if (mediaRecorder) { try { mediaRecorder.stop() - } catch {} + } catch { + // Already stopped or never started; nothing to clean up + } } useAudioService().stopAllTracks(currentStream) currentStream = null diff --git a/src/extensions/core/uploadImage.ts b/src/extensions/core/uploadImage.ts index 58e43bb2181..01552216243 100644 --- a/src/extensions/core/uploadImage.ts +++ b/src/extensions/core/uploadImage.ts @@ -1,9 +1,6 @@ import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode' -import { - type ComfyNodeDef, - type InputSpec, - isMediaUploadComboInput -} from '@/schemas/nodeDefSchema' +import { isMediaUploadComboInput } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef, InputSpec } from '@/schemas/nodeDefSchema' import { app } from '../../scripts/app' diff --git a/src/extensions/core/webcamCapture.ts b/src/extensions/core/webcamCapture.ts index 5f792215c52..641614bd062 100644 --- a/src/extensions/core/webcamCapture.ts +++ b/src/extensions/core/webcamCapture.ts @@ -38,7 +38,7 @@ app.registerExtension({ // @ts-expect-error fixme ts strict error video.addEventListener('loadedmetadata', () => res(video), false) video.srcObject = stream - video.play() + void video.play() } catch (error) { const label = document.createElement('div') label.style.color = 'red' @@ -62,7 +62,7 @@ app.registerExtension({ } } - loadVideo() + void loadVideo() return { widget: node.addDOMWidget(inputName, 'WEBCAM', container) } } diff --git a/src/extensions/core/widgetInputs.refreshCombo.test.ts b/src/extensions/core/widgetInputs.refreshCombo.test.ts index 053db9026e4..6b740b1f8cd 100644 --- a/src/extensions/core/widgetInputs.refreshCombo.test.ts +++ b/src/extensions/core/widgetInputs.refreshCombo.test.ts @@ -126,10 +126,10 @@ describe('PrimitiveNode.refreshComboInNode', () => { setActivePinia(createTestingPinia({ stubActions: false })) }) - it.each<[string, InputSpec]>([ + it.for<[string, InputSpec]>([ ['V1', [FRESH_OPTIONS, {}]], ['V2', ['COMBO', { options: FRESH_OPTIONS }]] - ])('updates options from fresh %s definitions', (_, inputSpec) => { + ])('updates options from fresh %s definitions', ([, inputSpec]) => { const { node, widget } = setupComboNode() node.refreshComboInNode(defsWithSpec(inputSpec)) diff --git a/src/extensions/core/widgetInputs.test.ts b/src/extensions/core/widgetInputs.test.ts index 41a2425c0b7..d0a84f0fa6c 100644 --- a/src/extensions/core/widgetInputs.test.ts +++ b/src/extensions/core/widgetInputs.test.ts @@ -141,7 +141,7 @@ describe('PrimitiveNode', () => { expect(primitive.widgets?.[0].value).toBe(333) }) - it.each([ + it.for([ { label: 'null', value: null }, { label: 'undefined', value: undefined } ])('restores an explicit $label value', ({ value }) => { @@ -287,8 +287,7 @@ describe('PrimitiveNode', () => { primitive.onAfterGraphConfigured() expect(primitive.widgets).toBeUndefined() - reroute.inputs[0].widget![GET_CONFIG] = - target.inputs[0].widget?.[GET_CONFIG] + reroute.inputs[0].widget[GET_CONFIG] = target.inputs[0].widget?.[GET_CONFIG] primitive.recreateWidget() expect(primitive.widgets?.[0].value).toBe(222) @@ -462,7 +461,7 @@ describe('convertToInput', () => { describe('setWidgetConfig', () => { beforeEach(() => { setActivePinia(createTestingPinia({ stubActions: false })) - widgetInputsExtension.registerCustomNodes?.(app) + void widgetInputsExtension.registerCustomNodes?.(app) }) /** A primitive feeding a widget-backed input, as reroute/paste leave it. */ @@ -553,7 +552,7 @@ describe('Comfy.WidgetInputs node-def hooks', () => { node.onGraphConfigured?.() expect(original).toHaveBeenCalled() - expect(node.inputs[0].widget![GET_CONFIG]!()).toEqual([ + expect(node.inputs[0].widget[GET_CONFIG]!()).toEqual([ 'INT', { min: 0, max: 8 } ]) @@ -583,10 +582,7 @@ describe('Comfy.WidgetInputs node-def hooks', () => { node.onConfigure?.(fromPartial({})) - expect(node.inputs[0].widget![GET_CONFIG]!()).toEqual([ - 'INT', - { max: 50 } - ]) + expect(node.inputs[0].widget[GET_CONFIG]!()).toEqual(['INT', { max: 50 }]) }) it('defers to onGraphConfigured while a whole graph is loading', async () => { @@ -598,13 +594,13 @@ describe('Comfy.WidgetInputs node-def hooks', () => { node.onConfigure?.(fromPartial({})) - expect(node.inputs[0].widget![GET_CONFIG]).toBeUndefined() + expect(node.inputs[0].widget[GET_CONFIG]).toBeUndefined() }) }) describe('onInputDblClick', () => { beforeEach(() => { - widgetInputsExtension.registerCustomNodes?.(app) + void widgetInputsExtension.registerCustomNodes?.(app) }) async function targetIn(graph: LGraph) {