Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .oxlintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -230,6 +229,12 @@
"playwright/valid-expect-in-promise": "error",
"playwright/valid-title": "error"
}
},
{
"files": ["src/extensions/core/**"],
"rules": {
"typescript/no-unnecessary-condition": "warn"
Comment thread
mattmillerai marked this conversation as resolved.
Resolved
}
}
]
}
1 change: 0 additions & 1 deletion eslint.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
24 changes: 15 additions & 9 deletions src/extensions/core/agentPanel.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ async function loadEntryAndSetup(): Promise<void> {
(e) => e.name === 'Comfy.AgentPanel'
)
expect(ext).toBeDefined()
ext!.setup!({} as Parameters<NonNullable<ComfyExtension['setup']>>[0])
void ext!.setup!({} as Parameters<NonNullable<ComfyExtension['setup']>>[0])
for (let i = 0; i < 2000 && mocks.flagListener === null; i++) await flush()
expect(mocks.flagListener).toBeTypeOf('function')
}
Expand Down Expand Up @@ -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()
Expand All @@ -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
Expand All @@ -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()
})
Expand All @@ -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])
Expand All @@ -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()
Expand All @@ -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()
Expand All @@ -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()
})
Expand Down Expand Up @@ -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()
})
Expand Down
4 changes: 1 addition & 3 deletions src/extensions/core/cameraInfo/CameraInfoOverlay.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/extensions/core/cameraInfo/CameraInfoViewport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<DragHandleType>(
return pickHandleAtPointer(
this.raycaster,
this.pointer,
this.viewport.cameraManager.activeCamera,
targets,
this.canvas
)
) as DragHandleType | null
}

private setHoveredHandle(type: DragHandleType | null): void {
Expand Down
10 changes: 5 additions & 5 deletions src/extensions/core/cameraInfo/handles/handlePicking.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@ function toScreenPx(
)
}

export function pickHandleAtPointer<T extends string>(
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)
Expand All @@ -44,7 +44,7 @@ export function pickHandleAtPointer<T extends string>(
const distance = px.distanceTo(pointerPx)
if (distance < bestDistance) {
bestDistance = distance
best = target.userData.handleType as T
best = target.userData.handleType as string
}
}
return best
Expand Down
7 changes: 3 additions & 4 deletions src/extensions/core/clipspace.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -34,7 +33,7 @@
const img_preview = document.getElementById(
'clipspace_preview'
) as HTMLImageElement
if (img_preview) {

Check warning on line 36 in src/extensions/core/clipspace.ts

View workflow job for this annotation

GitHub Actions / lint-and-format

typescript(no-unnecessary-condition)

src/extensions/core/clipspace.ts:36:11: Unnecessary conditional, value is always truthy.

Check warning on line 36 in src/extensions/core/clipspace.ts

View workflow job for this annotation

GitHub Actions / lint-and-format

typescript(no-unnecessary-condition)

src/extensions/core/clipspace.ts:36:11: Unnecessary conditional, value is always truthy.
img_preview.src =
ComfyApp.clipspace.imgs[ComfyApp.clipspace['selectedIndex']].src
img_preview.style.maxHeight = '100%'
Expand All @@ -53,7 +52,7 @@
...self.createButtons()
])

if (self.element) {

Check warning on line 55 in src/extensions/core/clipspace.ts

View workflow job for this annotation

GitHub Actions / lint-and-format

typescript(no-unnecessary-condition)

src/extensions/core/clipspace.ts:55:11: Unnecessary conditional, value is always truthy.

Check warning on line 55 in src/extensions/core/clipspace.ts

View workflow job for this annotation

GitHub Actions / lint-and-format

typescript(no-unnecessary-condition)

src/extensions/core/clipspace.ts:55:11: Unnecessary conditional, value is always truthy.
// update
if (self.element.firstChild) {
self.element.removeChild(self.element.firstChild)
Expand Down Expand Up @@ -85,7 +84,7 @@
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])
Expand Down Expand Up @@ -150,7 +149,7 @@
$el('option', { value: 'selected' }, 'selected'),
$el('option', { value: 'all' }, 'all')
]
) as HTMLSelectElement
)
combo2.value = ComfyApp.clipspace['img_paste_mode']

const row2 = $el('tr', {}, [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
24 changes: 12 additions & 12 deletions src/extensions/core/electronAdapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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)
}
}

Expand Down Expand Up @@ -60,7 +60,7 @@ import { electronAPI as getElectronAPI } from '@/utils/envUtil'
) => {
if (!oldValue) return

electronAPI.Config.setWindowStyle(newValue)
void electronAPI.Config.setWindowStyle(newValue)
}
},
{
Expand Down Expand Up @@ -113,39 +113,39 @@ import { electronAPI as getElectronAPI } from '@/utils/envUtil'
label: 'Open Models Folder',
icon: 'pi pi-folder-open',
function() {
electronAPI.openModelsFolder()
void electronAPI.openModelsFolder()
}
},
{
id: 'Comfy-Desktop.Folders.OpenOutputsFolder',
label: 'Open Outputs Folder',
icon: 'pi pi-folder-open',
function() {
electronAPI.openOutputsFolder()
void electronAPI.openOutputsFolder()
}
},
{
id: 'Comfy-Desktop.Folders.OpenInputsFolder',
label: 'Open Inputs Folder',
icon: 'pi pi-folder-open',
function() {
electronAPI.openInputsFolder()
void electronAPI.openInputsFolder()
}
},
{
id: 'Comfy-Desktop.Folders.OpenCustomNodesFolder',
label: 'Open Custom Nodes Folder',
icon: 'pi pi-folder-open',
function() {
electronAPI.openCustomNodesFolder()
void electronAPI.openCustomNodesFolder()
}
},
{
id: 'Comfy-Desktop.Folders.OpenModelConfig',
label: 'Open extra_model_paths.yaml',
icon: 'pi pi-file',
function() {
electronAPI.openModelConfig()
void electronAPI.openModelConfig()
}
},
{
Expand Down Expand Up @@ -198,7 +198,7 @@ import { electronAPI as getElectronAPI } from '@/utils/envUtil'
})
if (proceed) {
try {
electronAPI.restartAndInstall()
void electronAPI.restartAndInstall()
Comment thread
mattmillerai marked this conversation as resolved.
Resolved
} catch (error) {
log.error('Error installing update:', error)
toastStore.add({
Expand Down Expand Up @@ -229,15 +229,15 @@ import { electronAPI as getElectronAPI } from '@/utils/envUtil'
type: 'reinstall'
})

if (proceed) electronAPI.reinstall()
if (proceed) void electronAPI.reinstall()
}
},
{
id: 'Comfy-Desktop.Restart',
label: 'Restart',
icon: 'pi pi-refresh',
function() {
electronAPI.restartApp()
void electronAPI.restartApp()
}
},
{
Expand All @@ -256,7 +256,7 @@ import { electronAPI as getElectronAPI } from '@/utils/envUtil'
if (!confirmed) return
}

electronAPI.quit()
void electronAPI.quit()
}
}
],
Expand Down
2 changes: 1 addition & 1 deletion src/extensions/core/groupNode.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const extensionState = vi.hoisted(() => ({
ext: undefined as ComfyExtension | undefined,
configuringGraph: false,
rootGraph: {
extra: {} as Record<string, unknown>,
extra: {},
nodes: [] as { id: string | number }[]
},
registerNodeDef:
Expand Down
Loading
Loading