diff --git a/browser_tests/fixtures/UserSelectPage.ts b/browser_tests/fixtures/UserSelectPage.ts index 62a961375..ff0735e17 100644 --- a/browser_tests/fixtures/UserSelectPage.ts +++ b/browser_tests/fixtures/UserSelectPage.ts @@ -1,4 +1,5 @@ -import { Page, test as base } from '@playwright/test' +import type { Page } from '@playwright/test' +import { test as base } from '@playwright/test' export class UserSelectPage { constructor( diff --git a/browser_tests/fixtures/components/ComfyNodeSearchBox.ts b/browser_tests/fixtures/components/ComfyNodeSearchBox.ts index 23dc104cf..fd40ca911 100644 --- a/browser_tests/fixtures/components/ComfyNodeSearchBox.ts +++ b/browser_tests/fixtures/components/ComfyNodeSearchBox.ts @@ -1,4 +1,4 @@ -import { Locator, Page } from '@playwright/test' +import type { Locator, Page } from '@playwright/test' export class ComfyNodeSearchFilterSelectionPanel { constructor(public readonly page: Page) {} diff --git a/browser_tests/fixtures/components/SettingDialog.ts b/browser_tests/fixtures/components/SettingDialog.ts index afaf86154..e9040a3a9 100644 --- a/browser_tests/fixtures/components/SettingDialog.ts +++ b/browser_tests/fixtures/components/SettingDialog.ts @@ -1,6 +1,6 @@ -import { Page } from '@playwright/test' +import type { Page } from '@playwright/test' -import { ComfyPage } from '../ComfyPage' +import type { ComfyPage } from '../ComfyPage' export class SettingDialog { constructor( diff --git a/browser_tests/fixtures/components/SidebarTab.ts b/browser_tests/fixtures/components/SidebarTab.ts index 7baaa1ef9..f3fbe42cf 100644 --- a/browser_tests/fixtures/components/SidebarTab.ts +++ b/browser_tests/fixtures/components/SidebarTab.ts @@ -1,4 +1,4 @@ -import { Locator, Page } from '@playwright/test' +import type { Locator, Page } from '@playwright/test' class SidebarTab { constructor( diff --git a/browser_tests/fixtures/components/Topbar.ts b/browser_tests/fixtures/components/Topbar.ts index 04a9117ce..6d0cd1fb3 100644 --- a/browser_tests/fixtures/components/Topbar.ts +++ b/browser_tests/fixtures/components/Topbar.ts @@ -1,4 +1,5 @@ -import { Locator, Page, expect } from '@playwright/test' +import type { Locator, Page } from '@playwright/test' +import { expect } from '@playwright/test' export class Topbar { private readonly menuLocator: Locator diff --git a/browser_tests/fixtures/ws.ts b/browser_tests/fixtures/ws.ts index e12c53465..f1ab1a538 100644 --- a/browser_tests/fixtures/ws.ts +++ b/browser_tests/fixtures/ws.ts @@ -12,9 +12,10 @@ export const webSocketFixture = base.extend<{ // so we can look it up to trigger messages const store: Record = ((window as any).__ws__ = {}) window.WebSocket = class extends window.WebSocket { - constructor() { - // @ts-expect-error - super(...arguments) + constructor( + ...rest: ConstructorParameters + ) { + super(...rest) store[this.url] = this } } diff --git a/browser_tests/globalSetup.ts b/browser_tests/globalSetup.ts index 12033fce3..881ef11c4 100644 --- a/browser_tests/globalSetup.ts +++ b/browser_tests/globalSetup.ts @@ -1,4 +1,4 @@ -import { FullConfig } from '@playwright/test' +import type { FullConfig } from '@playwright/test' import dotenv from 'dotenv' import { backupPath } from './utils/backupUtils' diff --git a/browser_tests/globalTeardown.ts b/browser_tests/globalTeardown.ts index 47bab3db9..aeed77294 100644 --- a/browser_tests/globalTeardown.ts +++ b/browser_tests/globalTeardown.ts @@ -1,4 +1,4 @@ -import { FullConfig } from '@playwright/test' +import type { FullConfig } from '@playwright/test' import dotenv from 'dotenv' import { restorePath } from './utils/backupUtils' diff --git a/browser_tests/helpers/manageGroupNode.ts b/browser_tests/helpers/manageGroupNode.ts index a444a97c6..45010b979 100644 --- a/browser_tests/helpers/manageGroupNode.ts +++ b/browser_tests/helpers/manageGroupNode.ts @@ -1,4 +1,4 @@ -import { Locator, Page } from '@playwright/test' +import type { Locator, Page } from '@playwright/test' export class ManageGroupNode { footer: Locator diff --git a/browser_tests/helpers/templates.ts b/browser_tests/helpers/templates.ts index 0d2c9f31e..c690b8702 100644 --- a/browser_tests/helpers/templates.ts +++ b/browser_tests/helpers/templates.ts @@ -1,7 +1,7 @@ -import { Locator, Page } from '@playwright/test' +import type { Locator, Page } from '@playwright/test' import path from 'path' -import { +import type { TemplateInfo, WorkflowTemplates } from '../../src/platform/workflow/templates/types/template' diff --git a/browser_tests/tests/actionbar.spec.ts b/browser_tests/tests/actionbar.spec.ts index a504ea4fc..b23e4466d 100644 --- a/browser_tests/tests/actionbar.spec.ts +++ b/browser_tests/tests/actionbar.spec.ts @@ -29,9 +29,9 @@ test.describe('Actionbar', () => { // Intercept the prompt queue endpoint let promptNumber = 0 - comfyPage.page.route('**/api/prompt', async (route, req) => { + await comfyPage.page.route('**/api/prompt', async (route, req) => { await new Promise((r) => setTimeout(r, 100)) - route.fulfill({ + await route.fulfill({ status: 200, body: JSON.stringify({ prompt_id: promptNumber, diff --git a/browser_tests/tests/changeTracker.spec.ts b/browser_tests/tests/changeTracker.spec.ts index 7a32833e4..8c23c835a 100644 --- a/browser_tests/tests/changeTracker.spec.ts +++ b/browser_tests/tests/changeTracker.spec.ts @@ -1,5 +1,5 @@ +import type { ComfyPage } from '../fixtures/ComfyPage' import { - ComfyPage, comfyExpect as expect, comfyPageFixture as test } from '../fixtures/ComfyPage' diff --git a/browser_tests/tests/chatHistory.spec.ts b/browser_tests/tests/chatHistory.spec.ts index db3397514..7d1bf6c10 100644 --- a/browser_tests/tests/chatHistory.spec.ts +++ b/browser_tests/tests/chatHistory.spec.ts @@ -1,4 +1,5 @@ -import { Page, expect } from '@playwright/test' +import type { Page } from '@playwright/test' +import { expect } from '@playwright/test' import { comfyPageFixture as test } from '../fixtures/ComfyPage' diff --git a/browser_tests/tests/dialog.spec.ts b/browser_tests/tests/dialog.spec.ts index cf2e5e6be..c86466215 100644 --- a/browser_tests/tests/dialog.spec.ts +++ b/browser_tests/tests/dialog.spec.ts @@ -1,4 +1,5 @@ -import { Locator, expect } from '@playwright/test' +import type { Locator } from '@playwright/test' +import { expect } from '@playwright/test' import type { Keybinding } from '../../src/schemas/keyBindingSchema' import { comfyPageFixture as test } from '../fixtures/ComfyPage' diff --git a/browser_tests/tests/extensionAPI.spec.ts b/browser_tests/tests/extensionAPI.spec.ts index 09a08384c..38f4a6c1d 100644 --- a/browser_tests/tests/extensionAPI.spec.ts +++ b/browser_tests/tests/extensionAPI.spec.ts @@ -1,6 +1,6 @@ import { expect } from '@playwright/test' -import { SettingParams } from '../../src/platform/settings/types' +import type { SettingParams } from '../../src/platform/settings/types' import { comfyPageFixture as test } from '../fixtures/ComfyPage' test.describe('Topbar commands', () => { diff --git a/browser_tests/tests/groupNode.spec.ts b/browser_tests/tests/groupNode.spec.ts index 41b50224a..fc8dbd646 100644 --- a/browser_tests/tests/groupNode.spec.ts +++ b/browser_tests/tests/groupNode.spec.ts @@ -1,6 +1,7 @@ import { expect } from '@playwright/test' -import { ComfyPage, comfyPageFixture as test } from '../fixtures/ComfyPage' +import type { ComfyPage } from '../fixtures/ComfyPage' +import { comfyPageFixture as test } from '../fixtures/ComfyPage' import type { NodeReference } from '../fixtures/utils/litegraphUtils' test.describe('Group Node', () => { diff --git a/browser_tests/tests/interaction.spec.ts b/browser_tests/tests/interaction.spec.ts index c3754ed3b..bd14f91ad 100644 --- a/browser_tests/tests/interaction.spec.ts +++ b/browser_tests/tests/interaction.spec.ts @@ -1,12 +1,13 @@ -import { Locator, expect } from '@playwright/test' -import { Position } from '@vueuse/core' +import type { Locator } from '@playwright/test' +import { expect } from '@playwright/test' +import type { Position } from '@vueuse/core' import { type ComfyPage, comfyPageFixture as test, testComfySnapToGridGridSize } from '../fixtures/ComfyPage' -import { type NodeReference } from '../fixtures/utils/litegraphUtils' +import type { NodeReference } from '../fixtures/utils/litegraphUtils' test.describe('Item Interaction', () => { test('Can select/delete all items', async ({ comfyPage }) => { diff --git a/browser_tests/tests/remoteWidgets.spec.ts b/browser_tests/tests/remoteWidgets.spec.ts index 05bb578df..7a54cae07 100644 --- a/browser_tests/tests/remoteWidgets.spec.ts +++ b/browser_tests/tests/remoteWidgets.spec.ts @@ -1,6 +1,7 @@ import { expect } from '@playwright/test' -import { ComfyPage, comfyPageFixture as test } from '../fixtures/ComfyPage' +import type { ComfyPage } from '../fixtures/ComfyPage' +import { comfyPageFixture as test } from '../fixtures/ComfyPage' test.describe('Remote COMBO Widget', () => { const mockOptions = ['d', 'c', 'b', 'a'] diff --git a/browser_tests/tests/sidebar/queue.spec.ts b/browser_tests/tests/sidebar/queue.spec.ts index 2d9dd10ba..39e2ced6e 100644 --- a/browser_tests/tests/sidebar/queue.spec.ts +++ b/browser_tests/tests/sidebar/queue.spec.ts @@ -160,7 +160,9 @@ test.describe.skip('Queue sidebar', () => { comfyPage }) => { await comfyPage.nextFrame() - expect(comfyPage.menu.queueTab.getGalleryImage(firstImage)).toBeVisible() + await expect( + comfyPage.menu.queueTab.getGalleryImage(firstImage) + ).toBeVisible() }) test('maintains active gallery item when new tasks are added', async ({ @@ -174,7 +176,9 @@ test.describe.skip('Queue sidebar', () => { const newTask = comfyPage.menu.queueTab.tasks.getByAltText(newImage) await newTask.waitFor({ state: 'visible' }) // The active gallery item should still be the initial image - expect(comfyPage.menu.queueTab.getGalleryImage(firstImage)).toBeVisible() + await expect( + comfyPage.menu.queueTab.getGalleryImage(firstImage) + ).toBeVisible() }) test.describe('Gallery navigation', () => { @@ -196,7 +200,9 @@ test.describe.skip('Queue sidebar', () => { delay: 256 }) await comfyPage.nextFrame() - expect(comfyPage.menu.queueTab.getGalleryImage(end)).toBeVisible() + await expect( + comfyPage.menu.queueTab.getGalleryImage(end) + ).toBeVisible() }) }) }) diff --git a/browser_tests/tests/templates.spec.ts b/browser_tests/tests/templates.spec.ts index f2c2e2bb5..9141e9135 100644 --- a/browser_tests/tests/templates.spec.ts +++ b/browser_tests/tests/templates.spec.ts @@ -1,4 +1,5 @@ -import { Page, expect } from '@playwright/test' +import type { Page } from '@playwright/test' +import { expect } from '@playwright/test' import { comfyPageFixture as test } from '../fixtures/ComfyPage' diff --git a/browser_tests/tests/versionMismatchWarnings.spec.ts b/browser_tests/tests/versionMismatchWarnings.spec.ts index d85f18723..b2c62aeb0 100644 --- a/browser_tests/tests/versionMismatchWarnings.spec.ts +++ b/browser_tests/tests/versionMismatchWarnings.spec.ts @@ -1,6 +1,6 @@ import { expect } from '@playwright/test' -import { SystemStats } from '../../src/schemas/apiSchema' +import type { SystemStats } from '../../src/schemas/apiSchema' import { comfyPageFixture as test } from '../fixtures/ComfyPage' test.describe('Version Mismatch Warnings', () => { diff --git a/tsconfig.eslint.json b/browser_tests/tsconfig.json similarity index 53% rename from tsconfig.eslint.json rename to browser_tests/tsconfig.json index 9b1635700..f600c4a7f 100644 --- a/tsconfig.eslint.json +++ b/browser_tests/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.json", + "extends": "../tsconfig.json", "compilerOptions": { /* Test files should not be compiled */ "noEmit": true, @@ -9,13 +9,6 @@ "resolveJsonModule": true }, "include": [ - "*.ts", - "*.mts", - "*.config.js", - "browser_tests/**/*.ts", - "scripts/**/*.js", - "scripts/**/*.ts", - "tests-ui/**/*.ts", - ".storybook/**/*.ts" + "**/*.ts", ] } diff --git a/eslint.config.ts b/eslint.config.ts index b92d6bbf7..94f8bb5f2 100644 --- a/eslint.config.ts +++ b/eslint.config.ts @@ -153,5 +153,14 @@ export default defineConfig([ } ] } + }, + { + files: ['tests-ui/**/*'], + rules: { + '@typescript-eslint/consistent-type-imports': [ + 'error', + { disallowTypeAnnotations: false } + ] + } } ]) diff --git a/tests-ui/tests/components/bottomPanel/tabs/terminal/BaseTerminal.test.ts b/tests-ui/tests/components/bottomPanel/tabs/terminal/BaseTerminal.test.ts index 9f8743318..faa20f654 100644 --- a/tests-ui/tests/components/bottomPanel/tabs/terminal/BaseTerminal.test.ts +++ b/tests-ui/tests/components/bottomPanel/tabs/terminal/BaseTerminal.test.ts @@ -1,5 +1,6 @@ import { createTestingPinia } from '@pinia/testing' -import { VueWrapper, mount } from '@vue/test-utils' +import type { VueWrapper } from '@vue/test-utils' +import { mount } from '@vue/test-utils' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { nextTick } from 'vue' import { createI18n } from 'vue-i18n' diff --git a/tests-ui/tests/components/dialog/footer/ManagerProgressFooter.test.ts b/tests-ui/tests/components/dialog/footer/ManagerProgressFooter.test.ts index e3ff5afb0..b9fd92eda 100644 --- a/tests-ui/tests/components/dialog/footer/ManagerProgressFooter.test.ts +++ b/tests-ui/tests/components/dialog/footer/ManagerProgressFooter.test.ts @@ -14,7 +14,7 @@ import { } from '@/stores/comfyManagerStore' import { useCommandStore } from '@/stores/commandStore' import { useDialogStore } from '@/stores/dialogStore' -import { TaskLog } from '@/types/comfyManagerTypes' +import type { TaskLog } from '@/types/comfyManagerTypes' // Mock modules vi.mock('@/stores/comfyManagerStore') diff --git a/tests-ui/tests/composables/canvas/useSelectedLiteGraphItems.test.ts b/tests-ui/tests/composables/canvas/useSelectedLiteGraphItems.test.ts index 2b248eddd..23e1e8dd3 100644 --- a/tests-ui/tests/composables/canvas/useSelectedLiteGraphItems.test.ts +++ b/tests-ui/tests/composables/canvas/useSelectedLiteGraphItems.test.ts @@ -2,12 +2,8 @@ import { createPinia, setActivePinia } from 'pinia' import { beforeEach, describe, expect, it, vi } from 'vitest' import { useSelectedLiteGraphItems } from '@/composables/canvas/useSelectedLiteGraphItems' -import { - LGraphEventMode, - LGraphNode, - Positionable, - Reroute -} from '@/lib/litegraph/src/litegraph' +import type { LGraphNode, Positionable } from '@/lib/litegraph/src/litegraph' +import { LGraphEventMode, Reroute } from '@/lib/litegraph/src/litegraph' import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import { app } from '@/scripts/app' diff --git a/tests-ui/tests/composables/useManagerQueue.test.ts b/tests-ui/tests/composables/useManagerQueue.test.ts index 0d9313446..c5e26944c 100644 --- a/tests-ui/tests/composables/useManagerQueue.test.ts +++ b/tests-ui/tests/composables/useManagerQueue.test.ts @@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { ref } from 'vue' import { useManagerQueue } from '@/composables/useManagerQueue' -import { components } from '@/types/generatedManagerTypes' +import type { components } from '@/types/generatedManagerTypes' // Mock dialog service vi.mock('@/services/dialogService', () => ({ diff --git a/tests-ui/tests/composables/useNodeChatHistory.test.ts b/tests-ui/tests/composables/useNodeChatHistory.test.ts index 0b47fabb6..4389b8c80 100644 --- a/tests-ui/tests/composables/useNodeChatHistory.test.ts +++ b/tests-ui/tests/composables/useNodeChatHistory.test.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { useNodeChatHistory } from '@/composables/node/useNodeChatHistory' -import { LGraphNode } from '@/lib/litegraph/src/litegraph' +import type { LGraphNode } from '@/lib/litegraph/src/litegraph' vi.mock( '@/renderer/extensions/vueNodes/widgets/composables/useChatHistoryWidget', diff --git a/tests-ui/tests/composables/useServerLogs.test.ts b/tests-ui/tests/composables/useServerLogs.test.ts index 3af4f0faa..c056b6f3a 100644 --- a/tests-ui/tests/composables/useServerLogs.test.ts +++ b/tests-ui/tests/composables/useServerLogs.test.ts @@ -3,7 +3,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { nextTick } from 'vue' import { useServerLogs } from '@/composables/useServerLogs' -import { LogsWsMessage } from '@/schemas/apiSchema' +import type { LogsWsMessage } from '@/schemas/apiSchema' import { api } from '@/scripts/api' vi.mock('@/scripts/api', () => ({ diff --git a/tests-ui/tests/litegraph/canvas/LinkConnectorSubgraphInputValidation.test.ts b/tests-ui/tests/litegraph/canvas/LinkConnectorSubgraphInputValidation.test.ts index f0470890e..957076526 100644 --- a/tests-ui/tests/litegraph/canvas/LinkConnectorSubgraphInputValidation.test.ts +++ b/tests-ui/tests/litegraph/canvas/LinkConnectorSubgraphInputValidation.test.ts @@ -5,7 +5,7 @@ import { LinkConnector } from '@/lib/litegraph/src/litegraph' import { MovingOutputLink } from '@/lib/litegraph/src/litegraph' import { ToOutputRenderLink } from '@/lib/litegraph/src/litegraph' import { LGraphNode, LLink } from '@/lib/litegraph/src/litegraph' -import { NodeInputSlot } from '@/lib/litegraph/src/litegraph' +import type { NodeInputSlot } from '@/lib/litegraph/src/litegraph' import { createTestSubgraph } from '../subgraph/fixtures/subgraphHelpers' diff --git a/tests-ui/tests/litegraph/core/LGraphNode.titleButtons.test.ts b/tests-ui/tests/litegraph/core/LGraphNode.titleButtons.test.ts index c88c6cfb2..6599d6562 100644 --- a/tests-ui/tests/litegraph/core/LGraphNode.titleButtons.test.ts +++ b/tests-ui/tests/litegraph/core/LGraphNode.titleButtons.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it, vi } from 'vitest' import { LGraphButton } from '@/lib/litegraph/src/litegraph' -import { LGraphCanvas } from '@/lib/litegraph/src/litegraph' +import type { LGraphCanvas } from '@/lib/litegraph/src/litegraph' import { LGraphNode } from '@/lib/litegraph/src/litegraph' describe('LGraphNode Title Buttons', () => { diff --git a/tests-ui/tests/litegraph/core/LinkConnector.integration.test.ts b/tests-ui/tests/litegraph/core/LinkConnector.integration.test.ts index c829a8ba7..da99d9135 100644 --- a/tests-ui/tests/litegraph/core/LinkConnector.integration.test.ts +++ b/tests-ui/tests/litegraph/core/LinkConnector.integration.test.ts @@ -1,13 +1,12 @@ // TODO: Fix these tests after migration import { afterEach, describe, expect, vi } from 'vitest' +import type { LGraph, Reroute } from '@/lib/litegraph/src/litegraph' import { type CanvasPointerEvent, - LGraph, LGraphNode, LLink, LinkConnector, - Reroute, type RerouteId } from '@/lib/litegraph/src/litegraph' diff --git a/tests-ui/tests/litegraph/core/NodeSlot.test.ts b/tests-ui/tests/litegraph/core/NodeSlot.test.ts index e06a44bc5..15215cbf0 100644 --- a/tests-ui/tests/litegraph/core/NodeSlot.test.ts +++ b/tests-ui/tests/litegraph/core/NodeSlot.test.ts @@ -1,6 +1,9 @@ import { describe, expect, it } from 'vitest' -import { INodeInputSlot, INodeOutputSlot } from '@/lib/litegraph/src/litegraph' +import type { + INodeInputSlot, + INodeOutputSlot +} from '@/lib/litegraph/src/litegraph' import { inputAsSerialisable, outputAsSerialisable diff --git a/tests-ui/tests/litegraph/subgraph/SubgraphConversion.test.ts b/tests-ui/tests/litegraph/subgraph/SubgraphConversion.test.ts index 824c06e57..f617ec341 100644 --- a/tests-ui/tests/litegraph/subgraph/SubgraphConversion.test.ts +++ b/tests-ui/tests/litegraph/subgraph/SubgraphConversion.test.ts @@ -1,9 +1,8 @@ // TODO: Fix these tests after migration import { assert, describe, expect, it } from 'vitest' +import type { ISlotType, LGraph } from '@/lib/litegraph/src/litegraph' import { - ISlotType, - LGraph, LGraphGroup, LGraphNode, LiteGraph diff --git a/tests-ui/tests/litegraph/subgraph/SubgraphNode.titleButton.test.ts b/tests-ui/tests/litegraph/subgraph/SubgraphNode.titleButton.test.ts index 514a52c40..9bc64802c 100644 --- a/tests-ui/tests/litegraph/subgraph/SubgraphNode.titleButton.test.ts +++ b/tests-ui/tests/litegraph/subgraph/SubgraphNode.titleButton.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it, vi } from 'vitest' import { LGraphButton } from '@/lib/litegraph/src/litegraph' -import { LGraphCanvas } from '@/lib/litegraph/src/litegraph' +import type { LGraphCanvas } from '@/lib/litegraph/src/litegraph' import { createTestSubgraph, diff --git a/tests-ui/tests/litegraph/subgraph/SubgraphSlotConnections.test.ts b/tests-ui/tests/litegraph/subgraph/SubgraphSlotConnections.test.ts index a82fddc0e..0c10b782a 100644 --- a/tests-ui/tests/litegraph/subgraph/SubgraphSlotConnections.test.ts +++ b/tests-ui/tests/litegraph/subgraph/SubgraphSlotConnections.test.ts @@ -5,8 +5,8 @@ import { LinkConnector } from '@/lib/litegraph/src/litegraph' import { ToInputFromIoNodeLink } from '@/lib/litegraph/src/litegraph' import { SUBGRAPH_INPUT_ID } from '@/lib/litegraph/src/litegraph' import { LGraphNode, type LinkNetwork } from '@/lib/litegraph/src/litegraph' -import { NodeInputSlot } from '@/lib/litegraph/src/litegraph' -import { NodeOutputSlot } from '@/lib/litegraph/src/litegraph' +import type { NodeInputSlot } from '@/lib/litegraph/src/litegraph' +import type { NodeOutputSlot } from '@/lib/litegraph/src/litegraph' import { isSubgraphInput, isSubgraphOutput diff --git a/tests-ui/tests/litegraph/subgraph/SubgraphWidgetPromotion.test.ts b/tests-ui/tests/litegraph/subgraph/SubgraphWidgetPromotion.test.ts index 75c20c0ba..36793829d 100644 --- a/tests-ui/tests/litegraph/subgraph/SubgraphWidgetPromotion.test.ts +++ b/tests-ui/tests/litegraph/subgraph/SubgraphWidgetPromotion.test.ts @@ -1,8 +1,8 @@ // TODO: Fix these tests after migration import { describe, expect, it } from 'vitest' -import type { ISlotType } from '@/lib/litegraph/src/litegraph' -import { LGraphNode, Subgraph } from '@/lib/litegraph/src/litegraph' +import type { ISlotType, Subgraph } from '@/lib/litegraph/src/litegraph' +import { LGraphNode } from '@/lib/litegraph/src/litegraph' import type { TWidgetType } from '@/lib/litegraph/src/litegraph' import { BaseWidget } from '@/lib/litegraph/src/litegraph' diff --git a/tests-ui/tests/litegraph/subgraph/fixtures/subgraphFixtures.ts b/tests-ui/tests/litegraph/subgraph/fixtures/subgraphFixtures.ts index b90a781e2..02134868c 100644 --- a/tests-ui/tests/litegraph/subgraph/fixtures/subgraphFixtures.ts +++ b/tests-ui/tests/litegraph/subgraph/fixtures/subgraphFixtures.ts @@ -5,8 +5,9 @@ * in their test files. Each fixture provides a clean, pre-configured subgraph * setup for different testing scenarios. */ -import { LGraph, Subgraph } from '@/lib/litegraph/src/litegraph' -import { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode' +import type { Subgraph } from '@/lib/litegraph/src/litegraph' +import { LGraph } from '@/lib/litegraph/src/litegraph' +import type { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode' import { test } from '../../core/fixtures/testExtensions' import { diff --git a/tests-ui/tests/nodeSearchService.test.ts b/tests-ui/tests/nodeSearchService.test.ts index 7f6c1f377..75e409501 100644 --- a/tests-ui/tests/nodeSearchService.test.ts +++ b/tests-ui/tests/nodeSearchService.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' import { NodeSearchService } from '@/services/nodeSearchService' import { ComfyNodeDefImpl } from '@/stores/nodeDefStore' diff --git a/tests-ui/tests/renderer/extensions/vueNodes/composables/useNodeEventHandlers.test.ts b/tests-ui/tests/renderer/extensions/vueNodes/composables/useNodeEventHandlers.test.ts index 57da3b080..038d27cb0 100644 --- a/tests-ui/tests/renderer/extensions/vueNodes/composables/useNodeEventHandlers.test.ts +++ b/tests-ui/tests/renderer/extensions/vueNodes/composables/useNodeEventHandlers.test.ts @@ -2,7 +2,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { ref } from 'vue' import type { VueNodeData } from '@/composables/graph/useGraphNodeManager' -import { useGraphNodeManager } from '@/composables/graph/useGraphNodeManager' +import type { useGraphNodeManager } from '@/composables/graph/useGraphNodeManager' import type { LGraphCanvas, LGraphNode } from '@/lib/litegraph/src/litegraph' import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import { useLayoutMutations } from '@/renderer/core/layout/operations/layoutMutations' diff --git a/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.test.ts b/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.test.ts index 9ec2cfdaf..e5c957085 100644 --- a/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.test.ts +++ b/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.test.ts @@ -2,7 +2,7 @@ import axios from 'axios' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { useRemoteWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget' -import { RemoteWidgetConfig } from '@/schemas/nodeDefSchema' +import type { RemoteWidgetConfig } from '@/schemas/nodeDefSchema' vi.mock('axios', () => { return { diff --git a/tests-ui/tests/renderer/thumbnail/composables/useWorkflowThumbnail.spec.ts b/tests-ui/tests/renderer/thumbnail/composables/useWorkflowThumbnail.spec.ts index e2f0d465f..338ce0fcc 100644 --- a/tests-ui/tests/renderer/thumbnail/composables/useWorkflowThumbnail.spec.ts +++ b/tests-ui/tests/renderer/thumbnail/composables/useWorkflowThumbnail.spec.ts @@ -1,10 +1,8 @@ import { createPinia, setActivePinia } from 'pinia' import { beforeEach, describe, expect, it, vi } from 'vitest' -import { - ComfyWorkflow, - useWorkflowStore -} from '@/platform/workflow/management/stores/workflowStore' +import type { ComfyWorkflow } from '@/platform/workflow/management/stores/workflowStore' +import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore' vi.mock('@/renderer/core/thumbnail/graphThumbnailRenderer', () => ({ createGraphThumbnail: vi.fn() diff --git a/tests-ui/tests/store/comfyManagerStore.test.ts b/tests-ui/tests/store/comfyManagerStore.test.ts index a1d748111..e0f2fd2cf 100644 --- a/tests-ui/tests/store/comfyManagerStore.test.ts +++ b/tests-ui/tests/store/comfyManagerStore.test.ts @@ -4,7 +4,7 @@ import { nextTick, ref } from 'vue' import { useComfyManagerService } from '@/services/comfyManagerService' import { useComfyManagerStore } from '@/stores/comfyManagerStore' -import { components as ManagerComponents } from '@/types/generatedManagerTypes' +import type { components as ManagerComponents } from '@/types/generatedManagerTypes' type InstalledPacksResponse = ManagerComponents['schemas']['InstalledPacksResponse'] diff --git a/tests-ui/tests/store/imagePreviewStore.test.ts b/tests-ui/tests/store/imagePreviewStore.test.ts index d0df957dc..d2bb8d639 100644 --- a/tests-ui/tests/store/imagePreviewStore.test.ts +++ b/tests-ui/tests/store/imagePreviewStore.test.ts @@ -1,8 +1,8 @@ import { createPinia, setActivePinia } from 'pinia' import { beforeEach, describe, expect, it, vi } from 'vitest' -import { LGraphNode } from '@/lib/litegraph/src/litegraph' -import { ExecutedWsMessage } from '@/schemas/apiSchema' +import type { LGraphNode } from '@/lib/litegraph/src/litegraph' +import type { ExecutedWsMessage } from '@/schemas/apiSchema' import { app } from '@/scripts/app' import { useNodeOutputStore } from '@/stores/imagePreviewStore' import * as litegraphUtil from '@/utils/litegraphUtil' diff --git a/tests-ui/tests/store/serverConfigStore.test.ts b/tests-ui/tests/store/serverConfigStore.test.ts index 1caa5b5a2..dd25c5b64 100644 --- a/tests-ui/tests/store/serverConfigStore.test.ts +++ b/tests-ui/tests/store/serverConfigStore.test.ts @@ -1,7 +1,7 @@ import { createPinia, setActivePinia } from 'pinia' import { beforeEach, describe, expect, it } from 'vitest' -import { ServerConfig } from '@/constants/serverConfig' +import type { ServerConfig } from '@/constants/serverConfig' import type { FormItem } from '@/platform/settings/types' import { useServerConfigStore } from '@/stores/serverConfigStore' diff --git a/tests-ui/tests/store/workflowStore.test.ts b/tests-ui/tests/store/workflowStore.test.ts index 90a86645e..105e43541 100644 --- a/tests-ui/tests/store/workflowStore.test.ts +++ b/tests-ui/tests/store/workflowStore.test.ts @@ -3,9 +3,11 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { nextTick } from 'vue' import type { Subgraph } from '@/lib/litegraph/src/litegraph' -import { +import type { ComfyWorkflow, - LoadedComfyWorkflow, + LoadedComfyWorkflow +} from '@/platform/workflow/management/stores/workflowStore' +import { useWorkflowBookmarkStore, useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore' diff --git a/tests-ui/tests/utils/litegraphUtil.test.ts b/tests-ui/tests/utils/litegraphUtil.test.ts index b4301941f..36a6692ee 100644 --- a/tests-ui/tests/utils/litegraphUtil.test.ts +++ b/tests-ui/tests/utils/litegraphUtil.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import { ISerialisedGraph } from '@/lib/litegraph/src/types/serialisation' +import type { ISerialisedGraph } from '@/lib/litegraph/src/types/serialisation' import type { IWidget } from '@/lib/litegraph/src/types/widgets' import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' import { diff --git a/tests-ui/tests/utils/treeUtilTest.test.ts b/tests-ui/tests/utils/treeUtilTest.test.ts index 9c367a30d..ebd1ffbd5 100644 --- a/tests-ui/tests/utils/treeUtilTest.test.ts +++ b/tests-ui/tests/utils/treeUtilTest.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import { TreeNode } from '@/types/treeExplorerTypes' +import type { TreeNode } from '@/types/treeExplorerTypes' import { buildTree, sortedTree } from '@/utils/treeUtil' describe('buildTree', () => { diff --git a/tests-ui/tsconfig.json b/tests-ui/tsconfig.json new file mode 100644 index 000000000..f600c4a7f --- /dev/null +++ b/tests-ui/tsconfig.json @@ -0,0 +1,14 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + /* Test files should not be compiled */ + "noEmit": true, + // "strict": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "resolveJsonModule": true + }, + "include": [ + "**/*.ts", + ] +}