diff --git a/browser_tests/README.md b/browser_tests/README.md index 72512a9e46b..dda3d62fd2b 100644 --- a/browser_tests/README.md +++ b/browser_tests/README.md @@ -869,19 +869,19 @@ await page.route('**/api/object_info', (route) => The three generated-type packages are auto-generated from OpenAPI specs — prefer them for any mock targeting their endpoints: -| Endpoint category | Type source | -| ------------------------------------------------- | ------------------------------------------------------------------------ | -| Cloud-only (hub, billing, workflows) | `@comfyorg/ingest-types` (`packages/ingest-types`) | -| Registry (releases, nodes, publishers) | `@comfyorg/registry-types` (`packages/registry-types`) | -| Manager (queue tasks, packages) | `@comfyorg/api-client/generatedManagerTypes` | -| Local webserver responses that differ from ingest | `@comfyorg/api-client/types` | -| WebSocket messages and custom-node outputs | `@comfyorg/api-client/executionTypes` | -| Frontend settings | `@comfyorg/settings-core/types` | -| Node definitions | `src/schemas/nodeDefSchema.ts`, `src/schemas/nodeDef/nodeDefSchemaV2.ts` | -| Templates | `@comfyorg/api-client/templateTypes` | -| Jobs API | `@comfyorg/api-client/jobTypes` (`zJobDetail`, `zJobsListResponse`) | -| Workflow validation | `src/platform/workflow/validation/schemas/workflowSchema.ts` | -| Asset metadata | `src/types/metadataTypes.ts` | +| Endpoint category | Type source | +| ------------------------------------------------- | -------------------------------------------------------------------------------------- | +| Cloud-only (hub, billing, workflows) | `@comfyorg/ingest-types` (`packages/ingest-types`) | +| Registry (releases, nodes, publishers) | `@comfyorg/registry-types` (`packages/registry-types`) | +| Manager (queue tasks, packages) | `@comfyorg/api-client/generatedManagerTypes` | +| Local webserver responses that differ from ingest | `@comfyorg/api-client/types` | +| WebSocket messages and custom-node outputs | `@comfyorg/api-client/executionTypes` | +| Frontend settings | `@comfyorg/settings-core/types` | +| Node definitions | `@comfyorg/object-info-parser`, `@comfyorg/object-info-parser/schemas/nodeDefSchemaV2` | +| Templates | `@comfyorg/api-client/templateTypes` | +| Jobs API | `@comfyorg/api-client/jobTypes` (`zJobDetail`, `zJobsListResponse`) | +| Workflow validation | `src/platform/workflow/validation/schemas/workflowSchema.ts` | +| Asset metadata | `src/types/metadataTypes.ts` | ```typescript // ✅ Import the type and annotate mock data diff --git a/browser_tests/fixtures/agentAutogrowHandWiredLinkFixture.ts b/browser_tests/fixtures/agentAutogrowHandWiredLinkFixture.ts index 0b11c9dcc31..e38e38322cd 100644 --- a/browser_tests/fixtures/agentAutogrowHandWiredLinkFixture.ts +++ b/browser_tests/fixtures/agentAutogrowHandWiredLinkFixture.ts @@ -2,7 +2,7 @@ import type { Page } from '@playwright/test' import { expect } from '@playwright/test' import type { WidgetCatalog, WorkflowJSON } from '@comfyorg/comfy-multi-player' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { toNodeId } from '@comfyorg/graph-model/nodeId' import { diff --git a/browser_tests/fixtures/agentAutogrowSpareInputFixture.ts b/browser_tests/fixtures/agentAutogrowSpareInputFixture.ts index f1ff93495a5..ddcdaa0bbb8 100644 --- a/browser_tests/fixtures/agentAutogrowSpareInputFixture.ts +++ b/browser_tests/fixtures/agentAutogrowSpareInputFixture.ts @@ -2,7 +2,7 @@ import type { Page } from '@playwright/test' import { expect } from '@playwright/test' import type { WidgetCatalog, WorkflowJSON } from '@comfyorg/comfy-multi-player' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { toNodeId } from '@comfyorg/graph-model/nodeId' import { diff --git a/browser_tests/fixtures/agentConversationFixture.ts b/browser_tests/fixtures/agentConversationFixture.ts index 6a3cf30d649..f83a571ac36 100644 --- a/browser_tests/fixtures/agentConversationFixture.ts +++ b/browser_tests/fixtures/agentConversationFixture.ts @@ -9,7 +9,10 @@ import enMessages from '@/locales/en/main.json' with { type: 'json' } import type { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore' import type { ComfyWorkflowJSON } from '@comfyorg/graph-model/workflowSchema' import { validateComfyWorkflow } from '@comfyorg/graph-model/workflowSchema' -import type { ComfyNodeDef, ObjectInfoResponse } from '@/schemas/nodeDefSchema' +import type { + ComfyNodeDef, + ObjectInfoResponse +} from '@comfyorg/object-info-parser' import { toNodeId } from '@comfyorg/graph-model/nodeId' import type { NodeId } from '@comfyorg/graph-model/nodeId' import type { diff --git a/browser_tests/fixtures/agentCrdtIdCollisionFixture.ts b/browser_tests/fixtures/agentCrdtIdCollisionFixture.ts index d1d123d4c53..514b21036ec 100644 --- a/browser_tests/fixtures/agentCrdtIdCollisionFixture.ts +++ b/browser_tests/fixtures/agentCrdtIdCollisionFixture.ts @@ -37,7 +37,7 @@ import type { import type { WidgetCatalog, WorkflowJSON } from '@comfyorg/comfy-multi-player' import enMessages from '@/locales/en/main.json' with { type: 'json' } -import type { ObjectInfoResponse } from '@/schemas/nodeDefSchema' +import type { ObjectInfoResponse } from '@comfyorg/object-info-parser' import { parseAgentWsEvent } from '@/workbench/extensions/agent/schemas/agentApiSchema' import type { GraphOperation } from '@/workbench/extensions/agent/crdt/graphOperations' import { mintWireOps } from '@/workbench/extensions/agent/crdt/opEnvelope' diff --git a/browser_tests/fixtures/agentDynamicComboChildLinkFixture.ts b/browser_tests/fixtures/agentDynamicComboChildLinkFixture.ts index 93970dc4445..f2771c2b5c7 100644 --- a/browser_tests/fixtures/agentDynamicComboChildLinkFixture.ts +++ b/browser_tests/fixtures/agentDynamicComboChildLinkFixture.ts @@ -2,7 +2,7 @@ import type { Locator, Page } from '@playwright/test' import { expect } from '@playwright/test' import type { WidgetCatalog, WorkflowJSON } from '@comfyorg/comfy-multi-player' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { toLinkId } from '@comfyorg/graph-model/linkId' import { toNodeId } from '@comfyorg/graph-model/nodeId' diff --git a/browser_tests/fixtures/agentInlineReferencesFixture.ts b/browser_tests/fixtures/agentInlineReferencesFixture.ts index 9a495a20dbe..3b17268d531 100644 --- a/browser_tests/fixtures/agentInlineReferencesFixture.ts +++ b/browser_tests/fixtures/agentInlineReferencesFixture.ts @@ -1,7 +1,7 @@ import type { UploadImageResponse } from '@comfyorg/ingest-types' import { mergeTests } from '@playwright/test' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import type { ComfyWorkflowJSON } from '@comfyorg/graph-model/workflowSchema' import { agentTest } from '@e2e/fixtures/agentPanelFixture' import { workflowSelectionTest } from '@e2e/fixtures/agentWorkflowSelectionFixture' diff --git a/browser_tests/fixtures/agentNonValueWidgetRig.ts b/browser_tests/fixtures/agentNonValueWidgetRig.ts index 7dfa50b0ae4..4301be279d4 100644 --- a/browser_tests/fixtures/agentNonValueWidgetRig.ts +++ b/browser_tests/fixtures/agentNonValueWidgetRig.ts @@ -2,7 +2,7 @@ import { expect } from '@playwright/test' import type { Locator, Page } from '@playwright/test' import type { WidgetCatalog, WorkflowJSON } from '@comfyorg/comfy-multi-player' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' import { AgentFollowerHostSocket } from '@e2e/fixtures/agentFollowerHostSocket' diff --git a/browser_tests/fixtures/agentPanelFixture.ts b/browser_tests/fixtures/agentPanelFixture.ts index 4fff143988c..5eb74cc7241 100644 --- a/browser_tests/fixtures/agentPanelFixture.ts +++ b/browser_tests/fixtures/agentPanelFixture.ts @@ -16,7 +16,7 @@ import { } from '@/platform/settings/constants/agent' import { StorageKeys } from '@/platform/workflow/persistence/base/storageKeys' import type { ComfyWorkflowJSON } from '@comfyorg/graph-model/workflowSchema' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import type { AgentTurnAccepted } from '@/workbench/extensions/agent/schemas/agentApiSchema' import { mockAgentIdentity } from '@e2e/fixtures/agentSocket' diff --git a/browser_tests/fixtures/agentWorkflowSelectionFixture.ts b/browser_tests/fixtures/agentWorkflowSelectionFixture.ts index f4ee2295963..4603a7dacf8 100644 --- a/browser_tests/fixtures/agentWorkflowSelectionFixture.ts +++ b/browser_tests/fixtures/agentWorkflowSelectionFixture.ts @@ -2,7 +2,7 @@ import { networkIsolationFixture as base } from '@e2e/fixtures/networkIsolationF import type { RemoteConfig } from '@/platform/remoteConfig/types' import type { UserDataFullInfo } from '@comfyorg/api-client/types' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import type { CloudWorkflowEntry } from '@/workbench/extensions/agent/schemas/agentApiSchema' import { bootAgentApp } from '@e2e/fixtures/agentPanelFixture' diff --git a/browser_tests/fixtures/customNode/typePairing.ts b/browser_tests/fixtures/customNode/typePairing.ts index d6eaeccd9b1..70c18c43f08 100644 --- a/browser_tests/fixtures/customNode/typePairing.ts +++ b/browser_tests/fixtures/customNode/typePairing.ts @@ -93,7 +93,7 @@ function slotTypeOf(rawType: unknown): string | null { return typeof rawType === 'string' ? rawType : null } -// Faithful mirror of production naming (schemas/nodeDef/migration.ts): +// Faithful mirror of production naming (@comfyorg/object-info-parser/migration): // `output_name[index] || output_`, uncoerced - so a truthy non-string // entry names the live slot something no string lookup can match (null here). function outputSlotName(rawName: unknown, index: number): string | null { diff --git a/browser_tests/fixtures/data/agent/agentCrdtMultiAutogrowRealignFixture.ts b/browser_tests/fixtures/data/agent/agentCrdtMultiAutogrowRealignFixture.ts index a445fe90f03..832d9e29bd5 100644 --- a/browser_tests/fixtures/data/agent/agentCrdtMultiAutogrowRealignFixture.ts +++ b/browser_tests/fixtures/data/agent/agentCrdtMultiAutogrowRealignFixture.ts @@ -1,6 +1,6 @@ import type { WidgetCatalog, WorkflowJSON } from '@comfyorg/comfy-multi-player' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' /** Fixture data for `agentCrdtMultiAutogrowRealign.spec.ts`. */ diff --git a/browser_tests/fixtures/data/agent/agentFollowerMissingWidgetRefusal.ts b/browser_tests/fixtures/data/agent/agentFollowerMissingWidgetRefusal.ts index 26fd358a71c..aacf04fda8b 100644 --- a/browser_tests/fixtures/data/agent/agentFollowerMissingWidgetRefusal.ts +++ b/browser_tests/fixtures/data/agent/agentFollowerMissingWidgetRefusal.ts @@ -1,5 +1,5 @@ import type { WidgetCatalog, WorkflowJSON } from '@comfyorg/comfy-multi-player' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import type { RecordedGraphOperation } from '@e2e/fixtures/data/agent/agentConversation' diff --git a/browser_tests/fixtures/data/agent/agentSubgraphFollower.ts b/browser_tests/fixtures/data/agent/agentSubgraphFollower.ts index 815b1af8bc9..f5ce11c7484 100644 --- a/browser_tests/fixtures/data/agent/agentSubgraphFollower.ts +++ b/browser_tests/fixtures/data/agent/agentSubgraphFollower.ts @@ -1,6 +1,6 @@ import type { Op, WidgetCatalog } from '@comfyorg/comfy-multi-player' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import subgraphWorkflow from '@e2e/assets/subgraphs/agent-subgraph-with-two-promoted-widgets.json' with { type: 'json' } import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' diff --git a/browser_tests/fixtures/data/agent/agentVhsSavedWorkflow.ts b/browser_tests/fixtures/data/agent/agentVhsSavedWorkflow.ts index 23cb5b23853..2b8bab15ea9 100644 --- a/browser_tests/fixtures/data/agent/agentVhsSavedWorkflow.ts +++ b/browser_tests/fixtures/data/agent/agentVhsSavedWorkflow.ts @@ -2,7 +2,7 @@ import type { WidgetCatalog } from '@comfyorg/comfy-multi-player' import type { ComfyWorkflowJSON } from '@comfyorg/graph-model/workflowSchema' import { zComfyWorkflow } from '@comfyorg/graph-model/workflowSchema' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' export const VHS_WORKFLOW_ID = 'b7c1d2e3-0000-4000-8000-000000002018' export const VHS_MESSAGE_ID = 'b7c1d2e3-0000-4000-8000-000000002019' diff --git a/browser_tests/fixtures/data/agent/dynamicComboNode.ts b/browser_tests/fixtures/data/agent/dynamicComboNode.ts index 9c0235764c5..2c482fafbbb 100644 --- a/browser_tests/fixtures/data/agent/dynamicComboNode.ts +++ b/browser_tests/fixtures/data/agent/dynamicComboNode.ts @@ -1,4 +1,4 @@ -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' export const DYNAMIC_COMBO_CLASS = 'DynamicModePicker' diff --git a/browser_tests/fixtures/data/agent/inputOrder.ts b/browser_tests/fixtures/data/agent/inputOrder.ts index c391a9e3077..b9a0c9afbf9 100644 --- a/browser_tests/fixtures/data/agent/inputOrder.ts +++ b/browser_tests/fixtures/data/agent/inputOrder.ts @@ -1,7 +1,7 @@ import type { Size2D } from '@comfyorg/shared-frontend-utils/geometry' import type { WidgetCatalog, WorkflowJSON } from '@comfyorg/comfy-multi-player' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' export const workflowId = 'ac09c341-fc48-4860-9dc4-294950cb8705' export const threadId = 'c7f41995-964b-4ba9-9bfb-fdc972ad12bc' diff --git a/browser_tests/fixtures/data/agent/overflowWidgetPlainNode.ts b/browser_tests/fixtures/data/agent/overflowWidgetPlainNode.ts index f363e590254..c1d0e21a651 100644 --- a/browser_tests/fixtures/data/agent/overflowWidgetPlainNode.ts +++ b/browser_tests/fixtures/data/agent/overflowWidgetPlainNode.ts @@ -1,6 +1,6 @@ import type { WidgetCatalog, WorkflowJSON } from '@comfyorg/comfy-multi-player' -import type { ComfyNodeDef, InputSpec } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef, InputSpec } from '@comfyorg/object-info-parser' import overflowPlainWorkflow from '@e2e/assets/agent/overflow-widget-plain-node.json' with { type: 'json' } diff --git a/browser_tests/fixtures/data/agentReplayNodeDefs.ts b/browser_tests/fixtures/data/agentReplayNodeDefs.ts index 6a75edc69a8..c572b9dedc7 100644 --- a/browser_tests/fixtures/data/agentReplayNodeDefs.ts +++ b/browser_tests/fixtures/data/agentReplayNodeDefs.ts @@ -1,4 +1,4 @@ -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' type RequiredInputs = NonNullable< NonNullable['required'] diff --git a/browser_tests/fixtures/data/autogrowThenMaskNodeDef.ts b/browser_tests/fixtures/data/autogrowThenMaskNodeDef.ts index 34742a8909e..44aef2f10c5 100644 --- a/browser_tests/fixtures/data/autogrowThenMaskNodeDef.ts +++ b/browser_tests/fixtures/data/autogrowThenMaskNodeDef.ts @@ -1,4 +1,4 @@ -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' export const AUTOGROW_THEN_MASK_NODE_TYPE = 'AutogrowThenMaskTestNode' diff --git a/browser_tests/fixtures/data/byteDanceReferenceNodeDef.ts b/browser_tests/fixtures/data/byteDanceReferenceNodeDef.ts index 15b4d0b80b4..8a974a63152 100644 --- a/browser_tests/fixtures/data/byteDanceReferenceNodeDef.ts +++ b/browser_tests/fixtures/data/byteDanceReferenceNodeDef.ts @@ -1,4 +1,4 @@ -import type { ComfyNodeDef, InputSpec } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef, InputSpec } from '@comfyorg/object-info-parser' export const BYTEDANCE_REFERENCE_NODE_TYPE = 'ByteDance2ReferenceNode' diff --git a/browser_tests/fixtures/utils/cloudBootMocks.ts b/browser_tests/fixtures/utils/cloudBootMocks.ts index 36b147f6be9..f09bccda913 100644 --- a/browser_tests/fixtures/utils/cloudBootMocks.ts +++ b/browser_tests/fixtures/utils/cloudBootMocks.ts @@ -1,7 +1,7 @@ import type { Page } from '@playwright/test' import type { RemoteConfig } from '@/platform/remoteConfig/types' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { mockSystemStats } from '@e2e/fixtures/data/systemStats' import { CloudAuthHelper } from '@e2e/fixtures/helpers/CloudAuthHelper' diff --git a/browser_tests/fixtures/utils/objectInfo.ts b/browser_tests/fixtures/utils/objectInfo.ts index cd9c26f81b7..bc0855c8647 100644 --- a/browser_tests/fixtures/utils/objectInfo.ts +++ b/browser_tests/fixtures/utils/objectInfo.ts @@ -4,13 +4,13 @@ import { getComboSpecComboOptions, isComboInputSpec, isComboInputSpecV1 -} from '@/schemas/nodeDefSchema' +} from '@comfyorg/object-info-parser' import type { ComboInputSpec, ComboInputSpecV2, InputSpec, ObjectInfoResponse -} from '@/schemas/nodeDefSchema' +} from '@comfyorg/object-info-parser' type ComboInput = ComboInputSpec | ComboInputSpecV2 diff --git a/browser_tests/tests/agent/agentAttachedWorkflowImportFixture.ts b/browser_tests/tests/agent/agentAttachedWorkflowImportFixture.ts index 1cca2f03662..d901e151453 100644 --- a/browser_tests/tests/agent/agentAttachedWorkflowImportFixture.ts +++ b/browser_tests/tests/agent/agentAttachedWorkflowImportFixture.ts @@ -10,7 +10,7 @@ import { zAgentPostMessageRequest } from '@comfyorg/ingest-types/zod' import type { WorkflowJSON } from '@comfyorg/comfy-multi-player' import type { ComfyWorkflowJSON } from '@comfyorg/graph-model/workflowSchema' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import type { AgentTurnAccepted } from '@/workbench/extensions/agent/schemas/agentApiSchema' import { AgentFollowerHostSocket } from '@e2e/fixtures/agentFollowerHostSocket' diff --git a/browser_tests/tests/agent/agentCatalogRefreshClearsMissingModel.spec.ts b/browser_tests/tests/agent/agentCatalogRefreshClearsMissingModel.spec.ts index 0c4908a4e85..1eba4928a46 100644 --- a/browser_tests/tests/agent/agentCatalogRefreshClearsMissingModel.spec.ts +++ b/browser_tests/tests/agent/agentCatalogRefreshClearsMissingModel.spec.ts @@ -1,6 +1,6 @@ import { expect, mergeTests } from '@playwright/test' -import type { ObjectInfoResponse } from '@/schemas/nodeDefSchema' +import type { ObjectInfoResponse } from '@comfyorg/object-info-parser' import type { AgentWsEvent } from '@/workbench/extensions/agent/schemas/agentApiSchema' import { webSocketFixture } from '@e2e/fixtures/ws' diff --git a/browser_tests/tests/agent/agentComposerPaste.spec.ts b/browser_tests/tests/agent/agentComposerPaste.spec.ts index 8d32ce84e35..c51c22b1f3c 100644 --- a/browser_tests/tests/agent/agentComposerPaste.spec.ts +++ b/browser_tests/tests/agent/agentComposerPaste.spec.ts @@ -1,7 +1,7 @@ import { expect } from '@playwright/test' import type { ComfyWorkflowJSON } from '@comfyorg/graph-model/workflowSchema' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { agentTest as test, diff --git a/browser_tests/tests/agent/agentCrdtRejectedNodeAdd.spec.ts b/browser_tests/tests/agent/agentCrdtRejectedNodeAdd.spec.ts index 74a78748974..08f1e02f04a 100644 --- a/browser_tests/tests/agent/agentCrdtRejectedNodeAdd.spec.ts +++ b/browser_tests/tests/agent/agentCrdtRejectedNodeAdd.spec.ts @@ -4,7 +4,7 @@ import type { WidgetCatalog, WorkflowJSON } from '@comfyorg/comfy-multi-player' import enMessages from '@/locales/en/main.json' with { type: 'json' } -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import type { ComfyWorkflowJSON } from '@comfyorg/graph-model/workflowSchema' import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' diff --git a/browser_tests/tests/agent/agentDuplicateInsertOpaqueWidgetWrite.spec.ts b/browser_tests/tests/agent/agentDuplicateInsertOpaqueWidgetWrite.spec.ts index 67d5e4fd6f2..ddb3323b0fb 100644 --- a/browser_tests/tests/agent/agentDuplicateInsertOpaqueWidgetWrite.spec.ts +++ b/browser_tests/tests/agent/agentDuplicateInsertOpaqueWidgetWrite.spec.ts @@ -2,7 +2,7 @@ import { expect, mergeTests } from '@playwright/test' import type { Locator, Page, WebSocketRoute } from '@playwright/test' import type { Op, WidgetCatalog } from '@comfyorg/comfy-multi-player' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { BLANK_WORKFLOW, diff --git a/browser_tests/tests/agent/agentDuplicateWidgetOccurrenceFollower.spec.ts b/browser_tests/tests/agent/agentDuplicateWidgetOccurrenceFollower.spec.ts index 971e828d3d6..b0da75d1656 100644 --- a/browser_tests/tests/agent/agentDuplicateWidgetOccurrenceFollower.spec.ts +++ b/browser_tests/tests/agent/agentDuplicateWidgetOccurrenceFollower.spec.ts @@ -1,7 +1,7 @@ import { expect } from '@playwright/test' import type { WidgetCatalog, WorkflowJSON } from '@comfyorg/comfy-multi-player' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { agentTest as test, diff --git a/browser_tests/tests/agent/agentDynamicComboSetWidgetSilentlyDropped.spec.ts b/browser_tests/tests/agent/agentDynamicComboSetWidgetSilentlyDropped.spec.ts index 0c209c3d483..b84342f5df1 100644 --- a/browser_tests/tests/agent/agentDynamicComboSetWidgetSilentlyDropped.spec.ts +++ b/browser_tests/tests/agent/agentDynamicComboSetWidgetSilentlyDropped.spec.ts @@ -3,7 +3,7 @@ import { expect } from '@playwright/test' import type { WidgetCatalog, WorkflowJSON } from '@comfyorg/comfy-multi-player' import type { WorkflowListResponse } from '@comfyorg/ingest-types' import type { UserDataFullInfo } from '@comfyorg/api-client/types' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import type { GraphOperation } from '@/workbench/extensions/agent/crdt/graphOperations' import type { AgentRunModePreference, diff --git a/browser_tests/tests/agent/agentDynamicComboWidgetWrite.spec.ts b/browser_tests/tests/agent/agentDynamicComboWidgetWrite.spec.ts index 94dee02a505..1b8819055e2 100644 --- a/browser_tests/tests/agent/agentDynamicComboWidgetWrite.spec.ts +++ b/browser_tests/tests/agent/agentDynamicComboWidgetWrite.spec.ts @@ -1,7 +1,7 @@ import { expect } from '@playwright/test' import type { WidgetCatalog, WorkflowJSON } from '@comfyorg/comfy-multi-player' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import type { ComfyWorkflowJSON } from '@comfyorg/graph-model/workflowSchema' import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' diff --git a/browser_tests/tests/agent/agentFollowerDynamicGroupPositionalUpdate.spec.ts b/browser_tests/tests/agent/agentFollowerDynamicGroupPositionalUpdate.spec.ts index a1c826bd188..56e96f745d7 100644 --- a/browser_tests/tests/agent/agentFollowerDynamicGroupPositionalUpdate.spec.ts +++ b/browser_tests/tests/agent/agentFollowerDynamicGroupPositionalUpdate.spec.ts @@ -1,7 +1,7 @@ import { expect } from '@playwright/test' import type { WorkflowJSON } from '@comfyorg/comfy-multi-player' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { agentTest as test, diff --git a/browser_tests/tests/agent/agentFollowerLateEndpointLink.spec.ts b/browser_tests/tests/agent/agentFollowerLateEndpointLink.spec.ts index 3ee598a2e4f..53e135c3d74 100644 --- a/browser_tests/tests/agent/agentFollowerLateEndpointLink.spec.ts +++ b/browser_tests/tests/agent/agentFollowerLateEndpointLink.spec.ts @@ -1,7 +1,7 @@ import { expect, mergeTests } from '@playwright/test' import type { WidgetCatalog, WorkflowJSON } from '@comfyorg/comfy-multi-player' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { BLANK_WORKFLOW, diff --git a/browser_tests/tests/agent/agentHistoryReopensClosedWorkflow.spec.ts b/browser_tests/tests/agent/agentHistoryReopensClosedWorkflow.spec.ts index 9b7ac3e2f8f..ef21d012122 100644 --- a/browser_tests/tests/agent/agentHistoryReopensClosedWorkflow.spec.ts +++ b/browser_tests/tests/agent/agentHistoryReopensClosedWorkflow.spec.ts @@ -9,7 +9,7 @@ import type { import enMessages from '@/locales/en/main.json' with { type: 'json' } import type { UserDataFullInfo } from '@comfyorg/api-client/types' import type { ComfyWorkflowJSON } from '@comfyorg/graph-model/workflowSchema' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { agentTest as test, diff --git a/browser_tests/tests/agent/agentInsertWorkflowCanvasResult.spec.ts b/browser_tests/tests/agent/agentInsertWorkflowCanvasResult.spec.ts index 16005451c9d..d480648ac24 100644 --- a/browser_tests/tests/agent/agentInsertWorkflowCanvasResult.spec.ts +++ b/browser_tests/tests/agent/agentInsertWorkflowCanvasResult.spec.ts @@ -1,7 +1,7 @@ import { expect, mergeTests } from '@playwright/test' import type { Op, WidgetCatalog } from '@comfyorg/comfy-multi-player' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import subgraphAsset from '@e2e/assets/subgraphs/agent-subgraph-with-two-promoted-widgets.json' with { type: 'json' } import { diff --git a/browser_tests/tests/agent/agentOverflowWidgetOnNodeCreate.spec.ts b/browser_tests/tests/agent/agentOverflowWidgetOnNodeCreate.spec.ts index b73107451b1..461fd455ddb 100644 --- a/browser_tests/tests/agent/agentOverflowWidgetOnNodeCreate.spec.ts +++ b/browser_tests/tests/agent/agentOverflowWidgetOnNodeCreate.spec.ts @@ -1,7 +1,7 @@ import { expect } from '@playwright/test' import type { WidgetCatalog, WorkflowJSON } from '@comfyorg/comfy-multi-player' -import type { ComfyNodeDef, InputSpec } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef, InputSpec } from '@comfyorg/object-info-parser' import type { AgentRunModePreference } from '@/workbench/extensions/agent/schemas/agentApiSchema' import { diff --git a/browser_tests/tests/agent/agentPreviewTextWidgetNotMinted.spec.ts b/browser_tests/tests/agent/agentPreviewTextWidgetNotMinted.spec.ts index 687ef07450e..8f21df5583d 100644 --- a/browser_tests/tests/agent/agentPreviewTextWidgetNotMinted.spec.ts +++ b/browser_tests/tests/agent/agentPreviewTextWidgetNotMinted.spec.ts @@ -1,7 +1,7 @@ import { expect } from '@playwright/test' import type { WidgetCatalog, WorkflowJSON } from '@comfyorg/comfy-multi-player' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { AgentNonValueWidgetRig } from '@e2e/fixtures/agentNonValueWidgetRig' import type { AgentFollowerHostSocket } from '@e2e/fixtures/agentFollowerHostSocket' diff --git a/browser_tests/tests/agent/agentProgressTextWidgetNotMinted.spec.ts b/browser_tests/tests/agent/agentProgressTextWidgetNotMinted.spec.ts index c5b2f5e0a45..59577be0947 100644 --- a/browser_tests/tests/agent/agentProgressTextWidgetNotMinted.spec.ts +++ b/browser_tests/tests/agent/agentProgressTextWidgetNotMinted.spec.ts @@ -1,7 +1,7 @@ import { expect } from '@playwright/test' import type { WidgetCatalog, WorkflowJSON } from '@comfyorg/comfy-multi-player' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { AgentNonValueWidgetRig, diff --git a/browser_tests/tests/agent/agentUndefinedSerializeWidgetNotMinted.spec.ts b/browser_tests/tests/agent/agentUndefinedSerializeWidgetNotMinted.spec.ts index 0e37c5b9037..0450f3fcf84 100644 --- a/browser_tests/tests/agent/agentUndefinedSerializeWidgetNotMinted.spec.ts +++ b/browser_tests/tests/agent/agentUndefinedSerializeWidgetNotMinted.spec.ts @@ -1,7 +1,7 @@ import { expect } from '@playwright/test' import type { WidgetCatalog, WorkflowJSON } from '@comfyorg/comfy-multi-player' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { AgentNonValueWidgetRig } from '@e2e/fixtures/agentNonValueWidgetRig' import { agentTest as test } from '@e2e/fixtures/agentPanelFixture' diff --git a/browser_tests/tests/agent/agentWidgetFormHookDrift.spec.ts b/browser_tests/tests/agent/agentWidgetFormHookDrift.spec.ts index db173d514af..5288a191f2f 100644 --- a/browser_tests/tests/agent/agentWidgetFormHookDrift.spec.ts +++ b/browser_tests/tests/agent/agentWidgetFormHookDrift.spec.ts @@ -1,6 +1,6 @@ import { expect } from '@playwright/test' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { agentConversationTest as test } from '@e2e/fixtures/agentConversationFixture' diff --git a/browser_tests/tests/agent/agentWidgetFormRoundTrip.spec.ts b/browser_tests/tests/agent/agentWidgetFormRoundTrip.spec.ts index 53cc92b2cae..862f9ba670e 100644 --- a/browser_tests/tests/agent/agentWidgetFormRoundTrip.spec.ts +++ b/browser_tests/tests/agent/agentWidgetFormRoundTrip.spec.ts @@ -1,6 +1,6 @@ import { expect } from '@playwright/test' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { agentConversationTest as test } from '@e2e/fixtures/agentConversationFixture' diff --git a/browser_tests/tests/creditHelpers.spec.ts b/browser_tests/tests/creditHelpers.spec.ts index 8a9e7df69de..1361091a461 100644 --- a/browser_tests/tests/creditHelpers.spec.ts +++ b/browser_tests/tests/creditHelpers.spec.ts @@ -1,7 +1,7 @@ import { expect } from '@playwright/test' import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' function buildMockApiNode( name: string, diff --git a/browser_tests/tests/graph/reconnectNodeDefinitionRefresh.spec.ts b/browser_tests/tests/graph/reconnectNodeDefinitionRefresh.spec.ts index 56005f0f2de..36bcac72123 100644 --- a/browser_tests/tests/graph/reconnectNodeDefinitionRefresh.spec.ts +++ b/browser_tests/tests/graph/reconnectNodeDefinitionRefresh.spec.ts @@ -5,7 +5,7 @@ import { comfyPageFixture } from '@e2e/fixtures/ComfyPage' import { webSocketFixture } from '@e2e/fixtures/ws' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { toNodeId } from '@comfyorg/graph-model/nodeId' const test = mergeTests(comfyPageFixture, webSocketFixture).extend<{ diff --git a/browser_tests/tests/propertiesPanel/errorsTabMissingMediaRuntime.spec.ts b/browser_tests/tests/propertiesPanel/errorsTabMissingMediaRuntime.spec.ts index fb1ec3d0a9f..2551a4d7336 100644 --- a/browser_tests/tests/propertiesPanel/errorsTabMissingMediaRuntime.spec.ts +++ b/browser_tests/tests/propertiesPanel/errorsTabMissingMediaRuntime.spec.ts @@ -32,7 +32,7 @@ import { TestIds } from '@e2e/fixtures/selectors' import { mockViewFiles } from '@e2e/fixtures/utils/viewFileMocks' import { PropertiesPanelHelper } from '@e2e/tests/propertiesPanel/PropertiesPanelHelper' import type { RawJobListItem } from '@comfyorg/api-client/jobTypes' -import type { ComboInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { ComboInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import { toNodeId } from '@comfyorg/graph-model/nodeId' const ossTest = mergeTests(test, jobsRouteFixture) diff --git a/browser_tests/tests/propertiesPanel/infoTab.spec.ts b/browser_tests/tests/propertiesPanel/infoTab.spec.ts index 647a205868d..2a418fd2b76 100644 --- a/browser_tests/tests/propertiesPanel/infoTab.spec.ts +++ b/browser_tests/tests/propertiesPanel/infoTab.spec.ts @@ -1,6 +1,6 @@ import { expect } from '@playwright/test' -import type { ObjectInfoResponse } from '@/schemas/nodeDefSchema' +import type { ObjectInfoResponse } from '@comfyorg/object-info-parser' import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage' import { routeObjectInfoFromSetupApi } from '@e2e/fixtures/utils/objectInfo' import { PropertiesPanelHelper } from '@e2e/tests/propertiesPanel/PropertiesPanelHelper' diff --git a/browser_tests/tests/vueNodes/widgets/imageCropDynamicInputs.spec.ts b/browser_tests/tests/vueNodes/widgets/imageCropDynamicInputs.spec.ts index 7e4835c7af3..50b621c5cbc 100644 --- a/browser_tests/tests/vueNodes/widgets/imageCropDynamicInputs.spec.ts +++ b/browser_tests/tests/vueNodes/widgets/imageCropDynamicInputs.spec.ts @@ -2,7 +2,7 @@ import { comfyExpect as expect, comfyPageFixture } from '@e2e/fixtures/ComfyPage' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' const test = comfyPageFixture.extend({ page: async ({ page }, use) => { diff --git a/docs/architecture/domains/boundaries.json b/docs/architecture/domains/boundaries.json index 5cd439dee4c..b82b1169993 100644 --- a/docs/architecture/domains/boundaries.json +++ b/docs/architecture/domains/boundaries.json @@ -50,10 +50,6 @@ "name": "keybindings/integration/public", "patterns": ["src/platform/keybindings/composables/useShortcutsTab.ts"] }, - { - "name": "node-definition/domain/public", - "patterns": ["src/schemas/nodeDef/nodeDefSchemaV2.ts"] - }, { "name": "remote-config/infrastructure/public", "patterns": [ @@ -402,6 +398,9 @@ "packages/shared-frontend-utils/src/nodePricing.ts", "packages/shared-frontend-utils/src/nodePricing.test.ts", "src/constants/essentialsNodes.ts", + "src/core/graph/nodeDef/inputSpecInterpreter.ts", + "src/core/graph/nodeDef/inputSpecInterpreter.cap.test.ts", + "src/core/graph/nodeDef/inputSpecInterpreter.test.ts", "src/types/nodeDefAugmentation.ts", "src/types/nodeSource.ts", "src/workbench/utils/**", @@ -2417,7 +2416,6 @@ "src/renderer/hdr/**", "packages/keybindings/src/**", "src/platform/navigation/**", - "src/schemas/**", "src/platform/secrets/**", "src/core/graph/subgraph/**", "src/lib/litegraph/src/subgraph/**", @@ -2541,7 +2539,6 @@ "comfyui-api/domain/public", "ingest-api/domain/public", "keybindings/application/public", - "node-definition/domain/public", "server-facts/domain/public", "account/presentation", "_inventory/domain", @@ -2568,7 +2565,6 @@ "ingest-api/infrastructure/public", "keybindings/application/public", "keybindings/integration/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "webcam-capture/integration/public", @@ -2597,7 +2593,6 @@ "allow": [ "comfyui-api/domain/public", "ingest-api/domain/public", - "node-definition/domain/public", "server-facts/domain/public", "_inventory/domain", "_inventory/domain/outer-1", @@ -2611,7 +2606,6 @@ "allow": [ "comfyui-api/domain/public", "ingest-api/domain/public", - "node-definition/domain/public", "server-facts/domain/public", "_inventory/domain", "ingest-api/domain", @@ -2628,7 +2622,6 @@ "ingest-api/domain/public", "ingest-api/infrastructure/public", "keybindings/application/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "_inventory/domain", @@ -2653,7 +2646,6 @@ "ingest-api/domain/public", "ingest-api/infrastructure/public", "keybindings/application/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "_inventory/domain", @@ -2679,7 +2671,6 @@ "ingest-api/infrastructure/public", "keybindings/application/public", "keybindings/integration/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "webcam-capture/integration/public", @@ -2701,20 +2692,6 @@ "unclassified" ] }, - { - "from": "node-definition/domain/public", - "allow": [ - "comfyui-api/domain/public", - "ingest-api/domain/public", - "node-definition/domain/public", - "server-facts/domain/public", - "_inventory/domain", - "_inventory/domain/outer-1", - "_inventory/domain/outer-2", - "_inventory/domain/outer-3", - "unclassified" - ] - }, { "from": "remote-config/infrastructure/public", "allow": [ @@ -2722,7 +2699,6 @@ "ingest-api/domain/public", "ingest-api/infrastructure/public", "keybindings/application/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "_inventory/domain", @@ -2743,7 +2719,6 @@ "allow": [ "comfyui-api/domain/public", "ingest-api/domain/public", - "node-definition/domain/public", "server-facts/domain/public", "_inventory/domain", "server-facts/domain", @@ -2763,7 +2738,6 @@ "ingest-api/infrastructure/public", "keybindings/application/public", "keybindings/integration/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "webcam-capture/integration/public", @@ -2793,7 +2767,6 @@ "comfyui-api/domain/public", "ingest-api/domain/public", "keybindings/application/public", - "node-definition/domain/public", "server-facts/domain/public", "account/presentation", "_inventory/domain", @@ -2820,7 +2793,6 @@ "ingest-api/infrastructure/public", "keybindings/application/public", "keybindings/integration/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "webcam-capture/integration/public", @@ -2849,7 +2821,6 @@ "allow": [ "comfyui-api/domain/public", "ingest-api/domain/public", - "node-definition/domain/public", "server-facts/domain/public", "_inventory/domain", "_inventory/domain/outer-1", @@ -2865,7 +2836,6 @@ "ingest-api/domain/public", "ingest-api/infrastructure/public", "keybindings/application/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "_inventory/domain", @@ -2888,7 +2858,6 @@ "ingest-api/domain/public", "ingest-api/infrastructure/public", "keybindings/application/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "_inventory/domain", @@ -2911,7 +2880,6 @@ "comfyui-api/domain/public", "ingest-api/domain/public", "keybindings/application/public", - "node-definition/domain/public", "server-facts/domain/public", "_inventory/domain", "_inventory/application", @@ -2937,7 +2905,6 @@ "ingest-api/infrastructure/public", "keybindings/application/public", "keybindings/integration/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "webcam-capture/integration/public", @@ -2966,7 +2933,6 @@ "ingest-api/domain/public", "ingest-api/infrastructure/public", "keybindings/application/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "_inventory/domain", @@ -2990,7 +2956,6 @@ "comfyui-api/domain/public", "ingest-api/domain/public", "keybindings/application/public", - "node-definition/domain/public", "server-facts/domain/public", "_inventory/domain", "_inventory/application", @@ -3018,7 +2983,6 @@ "ingest-api/infrastructure/public", "keybindings/application/public", "keybindings/integration/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "webcam-capture/integration/public", @@ -3048,7 +3012,6 @@ "allow": [ "comfyui-api/domain/public", "ingest-api/domain/public", - "node-definition/domain/public", "server-facts/domain/public", "_inventory/domain", "image-compositor/domain", @@ -3066,7 +3029,6 @@ "ingest-api/domain/public", "ingest-api/infrastructure/public", "keybindings/application/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "_inventory/domain", @@ -3093,7 +3055,6 @@ "comfyui-api/domain/public", "ingest-api/domain/public", "keybindings/application/public", - "node-definition/domain/public", "server-facts/domain/public", "_inventory/domain", "_inventory/application", @@ -3123,7 +3084,6 @@ "ingest-api/infrastructure/public", "keybindings/application/public", "keybindings/integration/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "webcam-capture/integration/public", @@ -3158,7 +3118,6 @@ "ingest-api/domain/public", "ingest-api/infrastructure/public", "keybindings/application/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "_inventory/domain", @@ -3182,7 +3141,6 @@ "comfyui-api/domain/public", "ingest-api/domain/public", "keybindings/application/public", - "node-definition/domain/public", "server-facts/domain/public", "_inventory/domain", "_inventory/application", @@ -3210,7 +3168,6 @@ "ingest-api/infrastructure/public", "keybindings/application/public", "keybindings/integration/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "webcam-capture/integration/public", @@ -3240,7 +3197,6 @@ "allow": [ "comfyui-api/domain/public", "ingest-api/domain/public", - "node-definition/domain/public", "server-facts/domain/public", "_inventory/domain", "ingest-api/domain", @@ -3257,7 +3213,6 @@ "ingest-api/domain/public", "ingest-api/infrastructure/public", "keybindings/application/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "_inventory/domain", @@ -3282,7 +3237,6 @@ "ingest-api/domain/public", "ingest-api/infrastructure/public", "keybindings/application/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "_inventory/domain", @@ -3307,7 +3261,6 @@ "ingest-api/domain/public", "ingest-api/infrastructure/public", "keybindings/application/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "_inventory/domain", @@ -3332,7 +3285,6 @@ "comfyui-api/domain/public", "ingest-api/domain/public", "keybindings/application/public", - "node-definition/domain/public", "server-facts/domain/public", "_inventory/domain", "_inventory/application", @@ -3360,7 +3312,6 @@ "ingest-api/infrastructure/public", "keybindings/application/public", "keybindings/integration/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "webcam-capture/integration/public", @@ -3393,7 +3344,6 @@ "ingest-api/domain/public", "ingest-api/infrastructure/public", "keybindings/application/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "_inventory/domain", @@ -3417,7 +3367,6 @@ "comfyui-api/domain/public", "ingest-api/domain/public", "keybindings/application/public", - "node-definition/domain/public", "server-facts/domain/public", "_inventory/domain", "_inventory/application", @@ -3445,7 +3394,6 @@ "ingest-api/infrastructure/public", "keybindings/application/public", "keybindings/integration/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "webcam-capture/integration/public", @@ -3475,7 +3423,6 @@ "allow": [ "comfyui-api/domain/public", "ingest-api/domain/public", - "node-definition/domain/public", "server-facts/domain/public", "_inventory/domain", "server-facts/domain", @@ -3495,7 +3442,6 @@ "ingest-api/infrastructure/public", "keybindings/application/public", "keybindings/integration/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "webcam-capture/integration/public", @@ -3528,7 +3474,6 @@ "ingest-api/infrastructure/public", "keybindings/application/public", "keybindings/integration/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "webcam-capture/integration/public", @@ -3557,7 +3502,6 @@ "comfyui-api/domain/public", "ingest-api/domain/public", "keybindings/application/public", - "node-definition/domain/public", "server-facts/domain/public", "_inventory/domain", "_inventory/application", @@ -3578,7 +3522,6 @@ "allow": [ "comfyui-api/domain/public", "ingest-api/domain/public", - "node-definition/domain/public", "server-facts/domain/public", "_inventory/domain", "_inventory/domain/outer-1", @@ -3594,7 +3537,6 @@ "ingest-api/domain/public", "ingest-api/infrastructure/public", "keybindings/application/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "_inventory/domain", @@ -3617,7 +3559,6 @@ "ingest-api/domain/public", "ingest-api/infrastructure/public", "keybindings/application/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "_inventory/domain", @@ -3640,7 +3581,6 @@ "ingest-api/domain/public", "ingest-api/infrastructure/public", "keybindings/application/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "_inventory/domain", @@ -3665,7 +3605,6 @@ "allow": [ "comfyui-api/domain/public", "ingest-api/domain/public", - "node-definition/domain/public", "server-facts/domain/public", "_inventory/domain", "_inventory/domain/outer-1", @@ -3681,7 +3620,6 @@ "ingest-api/domain/public", "ingest-api/infrastructure/public", "keybindings/application/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "_inventory/domain", @@ -3704,7 +3642,6 @@ "comfyui-api/domain/public", "ingest-api/domain/public", "keybindings/application/public", - "node-definition/domain/public", "server-facts/domain/public", "_inventory/domain", "_inventory/application", @@ -3725,7 +3662,6 @@ "allow": [ "comfyui-api/domain/public", "ingest-api/domain/public", - "node-definition/domain/public", "server-facts/domain/public", "_inventory/domain", "image-compositor/domain", @@ -3743,7 +3679,6 @@ "ingest-api/domain/public", "ingest-api/infrastructure/public", "keybindings/application/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "_inventory/domain", @@ -3764,7 +3699,6 @@ "allow": [ "comfyui-api/domain/public", "ingest-api/domain/public", - "node-definition/domain/public", "server-facts/domain/public", "_inventory/domain", "_inventory/domain/outer-1", @@ -3783,7 +3717,6 @@ "ingest-api/infrastructure/public", "keybindings/application/public", "keybindings/integration/public", - "node-definition/domain/public", "remote-config/infrastructure/public", "server-facts/domain/public", "webcam-capture/integration/public", diff --git a/docs/architecture/domains/records/node-definition.domain.json b/docs/architecture/domains/records/node-definition.domain.json index 9620ae096a6..a16b1760323 100644 --- a/docs/architecture/domains/records/node-definition.domain.json +++ b/docs/architecture/domains/records/node-definition.domain.json @@ -1,14 +1,14 @@ { "id": "node-definition", "capability": "Node definition contracts (shared technical module)", - "description": "Shared technical module, not a business domain. The node definition contract read from /object_info: the @comfyorg/object-info-parser V1 schemas, node source classifier, and pack grouping helpers with their re-export, the V2 schema and V1-to-V2 migration, input spec tree diagnostics and flattening, searchable slot type collection, node source classification, upload input augmentation, input ordering for widget values, node help base URLs, and the essentials node list. The node definition store, node library and search UI, and widget constructors that consume these contracts belong to their own records.", + "description": "Shared technical module, not a business domain. App-side node definition contracts read from /object_info. @comfyorg/object-info-parser owns the V1 and V2 schemas, V1-to-V2 migration, the node source classifier and pack grouping helpers, and the input spec interpreter, including flattening and searchable slot type collection. This record holds the app's interpreter binding that reports input spec diagnostics, upload input augmentation, input ordering for widget values, node help base URLs, and the essentials node list. The node definition store, node library and search UI, and widget constructors that consume these contracts belong to their own records.", "modules": [ { "path": "src/constants/essentialsNodes.ts", "role": "domain" }, { - "path": "src/schemas/**", + "path": "src/core/graph/nodeDef/inputSpecInterpreter.ts", "role": "domain" }, { @@ -28,28 +28,29 @@ "role": "domain" } ], - "publicEntryPoints": ["src/schemas/nodeDef/nodeDefSchemaV2.ts"], + "publicEntryPoints": [], "characterizationScenarios": [ { "name": "V1 node definitions migrate to V2 and input spec trees report diagnostics within bounds", "checks": [ - "src/schemas/nodeDef/migration.test.ts", - "src/schemas/nodeDef/inputSpecTree.test.ts", - "src/schemas/nodeDef/inputSpecTree.cap.test.ts" + "packages/object-info-parser/src/__tests__/migration.test.ts", + "src/core/graph/nodeDef/inputSpecInterpreter.test.ts", + "src/core/graph/nodeDef/inputSpecInterpreter.cap.test.ts", + "packages/object-info-parser/src/__tests__/inputSpecInterpreter.test.ts" ] }, { "name": "Input specs flatten, searchable slot types are collected, and widget values follow input order", "checks": [ - "src/schemas/nodeDef/inputSpecUtil.test.ts", - "src/schemas/nodeDef/searchableSlotTypes.test.ts", + "packages/object-info-parser/src/__tests__/flattenInputSpecs.test.ts", + "packages/object-info-parser/src/__tests__/searchableSlotTypes.test.ts", "src/workbench/utils/nodeDefOrderingUtil.test.ts" ] } ], "adrs": [], "compatibilityPromises": [ - "Inventory preserves existing exports and runtime behavior. nodeDefSchemaV2 is the only public entry point; cross-module imports that break role direction remain inherited debt." + "Inventory preserves existing exports and runtime behavior. The domain has no public entry point; cross-module imports that break role direction remain inherited debt." ], "deepImports": "inventory" } diff --git a/docs/testing/unit-testing.md b/docs/testing/unit-testing.md index 5ca2d152281..0994cd104b4 100644 --- a/docs/testing/unit-testing.md +++ b/docs/testing/unit-testing.md @@ -225,10 +225,8 @@ Creating mock node definitions for testing: ```typescript // Example from a colocated schema unit test import { describe, expect, it } from 'vitest' -import { - type ComfyNodeDef, - validateComfyNodeDef -} from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' +import { validateComfyNodeDef } from '@comfyorg/object-info-parser' // Create a complete mock node definition const EXAMPLE_NODE_DEF: ComfyNodeDef = { diff --git a/oxlint-suppressions.json b/oxlint-suppressions.json index 60ffa5491fc..5a8beb5ae08 100644 --- a/oxlint-suppressions.json +++ b/oxlint-suppressions.json @@ -1094,7 +1094,7 @@ }, "src/types/index.ts": { "comfy/no-reexports": { - "count": 37 + "count": 35 } }, "src/types/slotId.test.ts": { diff --git a/packages/object-info-parser/package.json b/packages/object-info-parser/package.json index 28ef7f994c4..d611f97fb2e 100644 --- a/packages/object-info-parser/package.json +++ b/packages/object-info-parser/package.json @@ -18,6 +18,11 @@ "@comfyorg/object-info-parser": "./src/index.ts", "types": "./dist/index.d.ts", "default": "./src/index.ts" + }, + "./*": { + "@comfyorg/object-info-parser": "./src/*.ts", + "types": "./dist/*.d.ts", + "default": "./src/*.ts" } }, "scripts": { diff --git a/src/schemas/nodeDef/inputSpecUtil.test.ts b/packages/object-info-parser/src/__tests__/flattenInputSpecs.test.ts similarity index 86% rename from src/schemas/nodeDef/inputSpecUtil.test.ts rename to packages/object-info-parser/src/__tests__/flattenInputSpecs.test.ts index 0aae98908fc..166ce78f200 100644 --- a/src/schemas/nodeDef/inputSpecUtil.test.ts +++ b/packages/object-info-parser/src/__tests__/flattenInputSpecs.test.ts @@ -1,8 +1,10 @@ import { describe, expect, it } from 'vitest' -import { flattenInputSpecs } from '@/schemas/nodeDef/inputSpecUtil' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' -import { ComfyNodeDefImpl } from '@/core/graph/nodeDef/ComfyNodeDefImpl' +import { createInputSpecInterpreter } from '#/inputSpecInterpreter' +import { transformNodeDefV1ToV2 } from '#/migration' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '#/schemas/nodeDefSchema' + +const { flattenInputSpecs } = createInputSpecInterpreter(() => {}) describe('flattenInputSpecs', () => { it('includes a dynamic combo input alongside its nested per-option inputs', () => { @@ -57,8 +59,8 @@ describe('flattenInputSpecs', () => { output_node: false } - const nodeDefImpl = new ComfyNodeDefImpl(nodeDef) - const result = flattenInputSpecs(nodeDefImpl.inputs) + const nodeDefV2 = transformNodeDefV1ToV2(nodeDef) + const result = flattenInputSpecs(nodeDefV2.inputs) const byName = Object.fromEntries(result.map((spec) => [spec.name, spec])) expect(Object.keys(byName)).toEqual([ @@ -77,7 +79,7 @@ describe('flattenInputSpecs', () => { }) it('returns inputs unchanged when there is no dynamic combo', () => { - const nodeDefImpl = new ComfyNodeDefImpl({ + const nodeDefV2 = transformNodeDefV1ToV2({ name: 'PlainNode', display_name: 'Plain Node', category: 'Test', @@ -93,7 +95,7 @@ describe('flattenInputSpecs', () => { output_node: false }) - const result = flattenInputSpecs(nodeDefImpl.inputs) + const result = flattenInputSpecs(nodeDefV2.inputs) expect(result.map((spec) => spec.name)).toEqual(['seed']) }) @@ -145,8 +147,8 @@ describe('flattenInputSpecs', () => { output_node: false } - const nodeDefImpl = new ComfyNodeDefImpl(nodeDef) - const result = flattenInputSpecs(nodeDefImpl.inputs) + const nodeDefV2 = transformNodeDefV1ToV2(nodeDef) + const result = flattenInputSpecs(nodeDefV2.inputs) const thresholdSpecs = result.filter((spec) => spec.name === 'threshold') expect(thresholdSpecs).toHaveLength(1) @@ -173,10 +175,10 @@ describe('flattenInputSpecs', () => { output_node: false } - const nodeDefImpl = new ComfyNodeDefImpl(nodeDef) + const nodeDefV2 = transformNodeDefV1ToV2(nodeDef) - expect(() => flattenInputSpecs(nodeDefImpl.inputs)).not.toThrow() - const result = flattenInputSpecs(nodeDefImpl.inputs) + expect(() => flattenInputSpecs(nodeDefV2.inputs)).not.toThrow() + const result = flattenInputSpecs(nodeDefV2.inputs) expect(result.map((spec) => spec.name)).toEqual(['model']) }) @@ -199,8 +201,8 @@ describe('flattenInputSpecs', () => { output_node: false } - const nodeDefImpl = new ComfyNodeDefImpl(nodeDef) - const result = flattenInputSpecs(nodeDefImpl.inputs) + const nodeDefV2 = transformNodeDefV1ToV2(nodeDef) + const result = flattenInputSpecs(nodeDefV2.inputs) expect(result.map((spec) => spec.name)).toEqual(['model']) }) @@ -232,8 +234,8 @@ describe('flattenInputSpecs', () => { output_node: false } - const nodeDefImpl = new ComfyNodeDefImpl(nodeDef) - const result = flattenInputSpecs(nodeDefImpl.inputs) + const nodeDefV2 = transformNodeDefV1ToV2(nodeDef) + const result = flattenInputSpecs(nodeDefV2.inputs) expect(result.map((spec) => spec.name)).toEqual(['model', 'image']) }) diff --git a/src/schemas/nodeDef/inputSpecInterpreter.test.ts b/packages/object-info-parser/src/__tests__/inputSpecInterpreter.test.ts similarity index 88% rename from src/schemas/nodeDef/inputSpecInterpreter.test.ts rename to packages/object-info-parser/src/__tests__/inputSpecInterpreter.test.ts index d5acdcd983e..2c3bd970d5d 100644 --- a/src/schemas/nodeDef/inputSpecInterpreter.test.ts +++ b/packages/object-info-parser/src/__tests__/inputSpecInterpreter.test.ts @@ -1,7 +1,7 @@ import { expect, it, vi } from 'vitest' -import { createInputSpecInterpreter } from '@/schemas/nodeDef/inputSpecInterpreter' -import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration' +import { createInputSpecInterpreter } from '#/inputSpecInterpreter' +import { transformInputSpecV1ToV2 } from '#/migration' it('delivers every malformed option to its own sink without app dedupe or caps', () => { const sink = vi.fn() diff --git a/packages/object-info-parser/src/__tests__/migration.test.ts b/packages/object-info-parser/src/__tests__/migration.test.ts new file mode 100644 index 00000000000..4c55f9d131f --- /dev/null +++ b/packages/object-info-parser/src/__tests__/migration.test.ts @@ -0,0 +1,277 @@ +import { describe, expect, it } from 'vitest' + +import { + transformInputSpecV1ToV2, + transformInputSpecV2ToV1, + transformNodeDefV1ToV2 +} from '#/migration' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '#/schemas/nodeDefSchema' + +describe('NodeDef Migration', () => { + it('should correctly transform required input specs', () => { + const plainObject = { + required: { + intInput: ['INT', { min: 0, max: 100, default: 50 }], + stringInput: ['STRING', { default: 'Hello', multiline: true }] + } + } as ComfyNodeDefV1['input'] + + const nodeDef: ComfyNodeDefV1 = { + name: 'TestNode', + display_name: 'Test Node', + category: 'Testing', + python_module: 'test_module', + description: 'A test node', + input: plainObject, + output: [], + output_is_list: [], + output_name: [], + output_node: false + } + + const result = transformNodeDefV1ToV2(nodeDef) + + const intInput = result.inputs['intInput'] + const stringInput = result.inputs['stringInput'] + + expect(intInput.min).toBe(0) + expect(intInput.max).toBe(100) + expect(intInput.default).toBe(50) + expect(intInput.name).toBe('intInput') + expect(intInput.type).toBe('INT') + expect(stringInput.default).toBe('Hello') + expect(stringInput.multiline).toBe(true) + expect(stringInput.name).toBe('stringInput') + expect(stringInput.type).toBe('STRING') + }) + + it('should correctly transform optional input specs', () => { + const plainObject = { + optional: { + booleanInput: [ + 'BOOLEAN', + { default: true, labelOn: 'Yes', labelOff: 'No' } + ], + floatInput: ['FLOAT', { min: 0, max: 1, step: 0.1 }] + } + } as ComfyNodeDefV1['input'] + + const nodeDef: ComfyNodeDefV1 = { + name: 'TestNode', + display_name: 'Test Node', + category: 'Testing', + python_module: 'test_module', + description: 'A test node', + input: plainObject, + output: [], + output_is_list: [], + output_name: [], + output_node: false + } + + const result = transformNodeDefV1ToV2(nodeDef) + + const booleanInput = result.inputs['booleanInput'] + const floatInput = result.inputs['floatInput'] + + expect(booleanInput.default).toBe(true) + expect(booleanInput.labelOn).toBe('Yes') + expect(booleanInput.labelOff).toBe('No') + expect(booleanInput.type).toBe('BOOLEAN') + expect(booleanInput.isOptional).toBe(true) + expect(floatInput.min).toBe(0) + expect(floatInput.max).toBe(1) + expect(floatInput.step).toBe(0.1) + expect(floatInput.type).toBe('FLOAT') + expect(floatInput.isOptional).toBe(true) + }) + + it('should handle combo input specs', () => { + const plainObject = { + optional: { + comboInput: [[1, 2, 3], { default: 2 }] + } + } as ComfyNodeDefV1['input'] + + const nodeDef: ComfyNodeDefV1 = { + name: 'TestNode', + display_name: 'Test Node', + category: 'Testing', + python_module: 'test_module', + description: 'A test node', + input: plainObject, + output: [], + output_is_list: [], + output_name: [], + output_node: false + } + + const result = transformNodeDefV1ToV2(nodeDef) + expect(result.inputs['comboInput'].type).toBe('COMBO') + expect(result.inputs['comboInput'].default).toBe(2) + expect(result.inputs['comboInput'].options).toEqual([1, 2, 3]) + }) + + it('should handle combo input specs (auto-default)', () => { + const plainObject = { + optional: { + comboInput: [[1, 2, 3], {}] + } + } as ComfyNodeDefV1['input'] + + const nodeDef: ComfyNodeDefV1 = { + name: 'TestNode', + display_name: 'Test Node', + category: 'Testing', + python_module: 'test_module', + description: 'A test node', + input: plainObject, + output: [], + output_is_list: [], + output_name: [], + output_node: false + } + + const result = transformNodeDefV1ToV2(nodeDef) + expect(result.inputs['comboInput'].type).toBe('COMBO') + // Should pick the first choice as default + expect(result.inputs['comboInput'].options).toEqual([1, 2, 3]) + }) + + it('should handle custom input specs', () => { + const plainObject = { + optional: { + customInput: ['CUSTOM_TYPE', { default: 'custom value' }] + } + } as ComfyNodeDefV1['input'] + + const nodeDef: ComfyNodeDefV1 = { + name: 'TestNode', + display_name: 'Test Node', + category: 'Testing', + python_module: 'test_module', + description: 'A test node', + input: plainObject, + output: [], + output_is_list: [], + output_name: [], + output_node: false + } + + const result = transformNodeDefV1ToV2(nodeDef) + expect(result.inputs['customInput'].type).toBe('CUSTOM_TYPE') + expect(result.inputs['customInput'].default).toBe('custom value') + }) + + it('should map CHART option type to chartType', () => { + const plainObject = { + optional: { + chartInput: ['CHART', { type: 'bar', data: { labels: [] } }] + } + } as ComfyNodeDefV1['input'] + + const nodeDef: ComfyNodeDefV1 = { + name: 'TestNode', + display_name: 'Test Node', + category: 'Testing', + python_module: 'test_module', + description: 'A test node', + input: plainObject, + output: [], + output_is_list: [], + output_name: [], + output_node: false + } + + const result = transformNodeDefV1ToV2(nodeDef) + const chartInput = result.inputs['chartInput'] + expect(chartInput.type).toBe('CHART') + expect(chartInput).toMatchObject({ chartType: 'bar', data: { labels: [] } }) + }) + + it('should default a dynamic combo with no supplied options to an empty options array', () => { + // Synthetic subgraph-blueprint nodedefs (subgraphStore.ts) promote a + // boundary input's type into a bare [type, undefined] tuple. + const result = transformInputSpecV1ToV2( + ['COMFY_DYNAMICCOMBO_V3', undefined], + { name: 'model' } + ) + + expect(result.type).toBe('COMFY_DYNAMICCOMBO_V3') + expect(result.options).toEqual([]) + }) + + it('should transform an input spec without options', () => { + const result = transformInputSpecV1ToV2(['PREVIEW_3D'], { name: 'image' }) + + expect(result).toEqual({ + type: 'PREVIEW_3D', + name: 'image', + isOptional: false + }) + }) + + it('should preserve chartType across a V2 to V1 round trip', () => { + const inputSpec = transformInputSpecV1ToV2(['CHART', { type: 'bar' }], { + name: 'chartInput' + }) + + const result = transformInputSpecV1ToV2( + transformInputSpecV2ToV1(inputSpec), + { name: 'chartInput' } + ) + + expect(result.chartType).toBe('bar') + }) + + it('should not transform hidden fields', () => { + const plainObject: NonNullable = { + hidden: { + someHiddenValue: 42, + anotherHiddenValue: { nested: 'object' } + } + } + + const nodeDef: ComfyNodeDefV1 = { + name: 'TestNode', + display_name: 'Test Node', + category: 'Testing', + python_module: 'test_module', + description: 'A test node', + input: plainObject, + output: [], + output_is_list: [], + output_name: [], + output_node: false + } + + const result = transformNodeDefV1ToV2(nodeDef) + + expect(result.hidden).toEqual(plainObject.hidden) + expect(result.hidden?.someHiddenValue).toBe(42) + expect(result.hidden?.anotherHiddenValue).toEqual({ nested: 'object' }) + }) + + it('should handle empty or undefined fields', () => { + const plainObject = {} + + const nodeDef: ComfyNodeDefV1 = { + name: 'TestNode', + display_name: 'Test Node', + category: 'Testing', + python_module: 'test_module', + description: 'A test node', + input: plainObject, + output: [], + output_is_list: [], + output_name: [], + output_node: false + } + + const result = transformNodeDefV1ToV2(nodeDef) + + expect(result).toBeDefined() + expect(result.inputs).toEqual({}) + expect(result.hidden).toBeUndefined() + }) +}) diff --git a/src/schemas/nodeDef/searchableSlotTypes.test.ts b/packages/object-info-parser/src/__tests__/searchableSlotTypes.test.ts similarity index 79% rename from src/schemas/nodeDef/searchableSlotTypes.test.ts rename to packages/object-info-parser/src/__tests__/searchableSlotTypes.test.ts index 827efca32dc..5110d1794b3 100644 --- a/src/schemas/nodeDef/searchableSlotTypes.test.ts +++ b/packages/object-info-parser/src/__tests__/searchableSlotTypes.test.ts @@ -1,12 +1,12 @@ import { describe, expect, it } from 'vitest' -import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration' -import type { OutputSpec as OutputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' -import { - collectSearchableInputTypes, - collectSearchableOutputTypes -} from '@/schemas/nodeDef/searchableSlotTypes' -import type { ComfyInputsSpec, InputSpec } from '@/schemas/nodeDefSchema' +import { createInputSpecInterpreter } from '#/inputSpecInterpreter' +import { transformInputSpecV1ToV2 } from '#/migration' +import type { ComfyInputsSpec, InputSpec } from '#/schemas/nodeDefSchema' +import type { OutputSpec as OutputSpecV2 } from '#/schemas/nodeDefSchemaV2' + +const { collectSearchableInputTypes, collectSearchableOutputTypes } = + createInputSpecInterpreter(() => {}) function dynamicCombo( options: { key: string; inputs: ComfyInputsSpec }[] @@ -233,6 +233,44 @@ describe('collectSearchableOutputTypes', () => { ).toEqual(['LATENT', 'MASK']) }) + it('unions a template group across inputs and ignores plain inputs', () => { + const inputs = { + image: toV2(['IMAGE', {}], 'image'), + first: toV2(matchType('LATENT,MASK', 'group-a'), 'first'), + second: toV2(matchType('MASK,AUDIO', 'group-a'), 'second') + } + + expect( + collectSearchableOutputTypes(outputs('COMFY_MATCHTYPE_V3'), inputs, [ + 'group-a' + ]) + ).toEqual(['LATENT', 'MASK', 'AUDIO']) + }) + + it('keeps a plain output beside a MatchType output', () => { + const inputs = { value: toV2(matchType('LATENT', 'group-a'), 'value') } + const mixedOutputs: OutputSpecV2[] = [ + { index: 0, name: 'image', type: 'IMAGE,MASK', is_list: false }, + { index: 1, name: 'out', type: 'COMFY_MATCHTYPE_V3', is_list: false } + ] + + expect( + collectSearchableOutputTypes(mixedOutputs, inputs, [undefined, 'group-a']) + ).toEqual(['IMAGE', 'MASK', 'LATENT']) + }) + + it('yields nothing for a MatchType output without a template id', () => { + const inputs = { value: toV2(matchType('LATENT', 'group-a'), 'value') } + + expect( + collectSearchableOutputTypes( + outputs('COMFY_MATCHTYPE_V3'), + inputs, + undefined + ) + ).toEqual([]) + }) + it('does not leak the placeholder when the template is unknown', () => { expect( collectSearchableOutputTypes(outputs('COMFY_MATCHTYPE_V3'), {}, [ diff --git a/src/schemas/nodeDef/inputSpecInterpreter.ts b/packages/object-info-parser/src/inputSpecInterpreter.ts similarity index 71% rename from src/schemas/nodeDef/inputSpecInterpreter.ts rename to packages/object-info-parser/src/inputSpecInterpreter.ts index 6d71a831f27..dd4c740d8a1 100644 --- a/src/schemas/nodeDef/inputSpecInterpreter.ts +++ b/packages/object-info-parser/src/inputSpecInterpreter.ts @@ -1,11 +1,14 @@ import type { ZodError } from 'zod' -import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration' -import type { InputSpec as InputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' +import { transformInputSpecV1ToV2 } from '#/migration' +import type { + InputSpec as InputSpecV2, + OutputSpec as OutputSpecV2 +} from '#/schemas/nodeDefSchemaV2' import type { ComfyInputsSpec, DynamicControlType -} from '@/schemas/nodeDefSchema' +} from '#/schemas/nodeDefSchema' import { isDynamicControlType, zAutogrowOptions, @@ -13,7 +16,7 @@ import { zDynamicComboSpecV2, zDynamicGroupInputSpec, zMatchTypeOptions -} from '@/schemas/nodeDefSchema' +} from '#/schemas/nodeDefSchema' interface DynamicControl { nestedInputs: (spec: InputSpecV2) => ComfyInputsSpec[] @@ -185,12 +188,64 @@ export function createInputSpecInterpreter( } } + /** Top-level and nested input specs, deduped by name with the first occurrence kept. */ + function flattenInputSpecs( + inputs: Record + ): InputSpecV2[] { + const seenNames = new Set() + return Object.values(inputs) + .flatMap(inputSpecTree) + .filter(({ name }) => { + if (seenNames.has(name)) return false + seenNames.add(name) + return true + }) + } + + /** Every slot type an input could expose across all DynamicCombo options; for search only. */ + function collectSearchableInputTypes(input: InputSpecV2): string[] { + return inputSpecTree(input).flatMap(ownSlotTypes) + } + + /** Every slot type an output could produce, resolving MatchType outputs to their template's allowed types. */ + function collectSearchableOutputTypes( + outputs: OutputSpecV2[], + inputs: Record, + outputMatchTypes: (string | undefined)[] | undefined + ): string[] { + if (!outputs.some((output) => output.type === 'COMFY_MATCHTYPE_V3')) { + return outputs.flatMap((output) => splitSlotTypes(output.type)) + } + + const allowedTypesByTemplate = new Map() + for (const spec of Object.values(inputs).flatMap(inputSpecTree)) { + const template = matchTypeTemplate(spec) + if (!template) continue + + const seen = allowedTypesByTemplate.get(template.templateId) ?? [] + allowedTypesByTemplate.set(template.templateId, [ + ...new Set([...seen, ...template.allowedTypes]) + ]) + } + + return outputs.flatMap((output) => { + if (output.type !== 'COMFY_MATCHTYPE_V3') + return splitSlotTypes(output.type) + + const templateId = outputMatchTypes?.[output.index] + return templateId ? (allowedTypesByTemplate.get(templateId) ?? []) : [] + }) + } + return { splitSlotTypes, inputSpecTree, ownSlotTypes, dynamicComboOptionKeys, dynamicComboOptionTypes, - matchTypeTemplate + matchTypeTemplate, + flattenInputSpecs, + collectSearchableInputTypes, + collectSearchableOutputTypes } } diff --git a/src/schemas/nodeDef/migration.ts b/packages/object-info-parser/src/migration.ts similarity index 97% rename from src/schemas/nodeDef/migration.ts rename to packages/object-info-parser/src/migration.ts index 01d659b1eb6..18439d9ac90 100644 --- a/src/schemas/nodeDef/migration.ts +++ b/packages/object-info-parser/src/migration.ts @@ -2,16 +2,16 @@ import type { ComfyNodeDef as ComfyNodeDefV2, InputSpec as InputSpecV2, OutputSpec as OutputSpecV2 -} from '@/schemas/nodeDef/nodeDefSchemaV2' +} from '#/schemas/nodeDefSchemaV2' import type { ComfyNodeDef as ComfyNodeDefV1, InputSpec as InputSpecV1 -} from '@/schemas/nodeDefSchema' +} from '#/schemas/nodeDefSchema' import { getComboSpecComboOptions, isComboInputSpec, isComboInputSpecV1 -} from '@/schemas/nodeDefSchema' +} from '#/schemas/nodeDefSchema' /** * Transforms a V1 node definition to V2 format diff --git a/src/schemas/nodeDef/nodeDefSchemaV2.ts b/packages/object-info-parser/src/schemas/nodeDefSchemaV2.ts similarity index 99% rename from src/schemas/nodeDef/nodeDefSchemaV2.ts rename to packages/object-info-parser/src/schemas/nodeDefSchemaV2.ts index ec2474d4f63..cddc4999437 100644 --- a/src/schemas/nodeDef/nodeDefSchemaV2.ts +++ b/packages/object-info-parser/src/schemas/nodeDefSchemaV2.ts @@ -8,7 +8,7 @@ import { zFloatInputOptions, zIntInputOptions, zStringInputOptions -} from '@/schemas/nodeDefSchema' +} from '#/schemas/nodeDefSchema' const zIntInputSpec = zIntInputOptions.extend({ type: z.literal('INT'), diff --git a/scripts/collect-i18n-node-defs.ts b/scripts/collect-i18n-node-defs.ts index 9e5efca03e8..e6221cc8503 100644 --- a/scripts/collect-i18n-node-defs.ts +++ b/scripts/collect-i18n-node-defs.ts @@ -1,7 +1,8 @@ import * as fs from 'fs' -import type { ComfyNodeDef as ComfyNodeDefV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import { transformNodeDefV1ToV2 } from '@comfyorg/object-info-parser/migration' +import type { ComfyNodeDef as ComfyNodeDefV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { comfyPageFixture as test } from '../browser_tests/fixtures/ComfyPage' import type { WidgetLabels } from './nodeDefLocaleSerializer' @@ -11,30 +12,21 @@ const localePath = './src/locales/en/main.json' const nodeDefsPath = './src/locales/en/nodeDefs.json' test('collect-i18n-node-defs', async ({ comfyPage }) => { - // Mock view route await comfyPage.page.route('**/view**', async (route) => { await route.fulfill({ body: JSON.stringify({}) }) }) - // Note: Don't mock the object_info API endpoint - let it hit the actual backend - - const nodeDefs: ComfyNodeDefV2[] = await comfyPage.page.evaluate(async () => { + const rawNodeDefs = await comfyPage.page.evaluate(async () => { const app = window.app if (!app) throw new Error('ComfyUI app is not initialized') - const rawNodeDefs = await app.api.getNodeDefs() - const { transformNodeDefV1ToV2 } = - await import('../src/schemas/nodeDef/migration') - - return ( - Object.values(rawNodeDefs) - // Ignore DevTools nodes (used for internal testing) - .filter((def: ComfyNodeDef) => !def.name.startsWith('DevTools')) - .map((def: ComfyNodeDef) => transformNodeDefV1ToV2(def)) - ) + return app.api.getNodeDefs() }) + const nodeDefs: ComfyNodeDefV2[] = Object.values(rawNodeDefs) + .filter((def: ComfyNodeDef) => !def.name.startsWith('DevTools')) + .map((def: ComfyNodeDef) => transformNodeDefV1ToV2(def)) async function extractWidgetLabels() { const nodeLabels: WidgetLabels = {} diff --git a/scripts/generate-json-schema.ts b/scripts/generate-json-schema.ts index 3e94b29f438..11b418bf2c0 100644 --- a/scripts/generate-json-schema.ts +++ b/scripts/generate-json-schema.ts @@ -6,8 +6,8 @@ import { zComfyWorkflow, zComfyWorkflow1 } from '@comfyorg/graph-model/workflowSchema' -import { zComfyNodeDef as zComfyNodeDefV2 } from '../src/schemas/nodeDef/nodeDefSchemaV2' -import { zComfyNodeDef as zComfyNodeDefV1 } from '../src/schemas/nodeDefSchema' +import { zComfyNodeDef as zComfyNodeDefV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' +import { zComfyNodeDef as zComfyNodeDefV1 } from '@comfyorg/object-info-parser' function toNamedJsonSchema(schema: z.ZodType, title: string) { return { diff --git a/scripts/nodeDefLocaleSerializer.test.ts b/scripts/nodeDefLocaleSerializer.test.ts index ae36535681e..8af77c32f99 100644 --- a/scripts/nodeDefLocaleSerializer.test.ts +++ b/scripts/nodeDefLocaleSerializer.test.ts @@ -3,8 +3,8 @@ import { describe, expect, it } from 'vitest' import { escapeI18nMessage } from '@comfyorg/shared-frontend-utils/formatUtil' -import { transformNodeDefV1ToV2 } from '@/schemas/nodeDef/migration' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +import { transformNodeDefV1ToV2 } from '@comfyorg/object-info-parser/migration' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import { serializeNodeDefLocales } from './nodeDefLocaleSerializer' diff --git a/scripts/registry-census/matrix_runner.ts b/scripts/registry-census/matrix_runner.ts index 6b796a4b02c..a96ba105b3f 100644 --- a/scripts/registry-census/matrix_runner.ts +++ b/scripts/registry-census/matrix_runner.ts @@ -19,7 +19,7 @@ import type { import type { PointTuple as Point } from '@comfyorg/shared-frontend-utils/geometry' import type { CanvasPointerEvent } from '@comfyorg/graph-model/events' import type { IBaseWidget } from '@comfyorg/graph-model/widgets' -import type { ComfyNodeDef, InputSpec } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef, InputSpec } from '@comfyorg/object-info-parser' import type { useWidgetValueStore } from '@/stores/widgetValueStore' import type * as WidgetValuesForm from '@/workbench/extensions/agent/crdt/widgetValuesForm' diff --git a/src/components/graph/NodeTooltip.test.ts b/src/components/graph/NodeTooltip.test.ts index 14a68cdd7d1..fd23fa5f5a1 100644 --- a/src/components/graph/NodeTooltip.test.ts +++ b/src/components/graph/NodeTooltip.test.ts @@ -11,7 +11,7 @@ import { } from '@/lib/litegraph/src/litegraph' import { useSettingStore } from '@/platform/settings/settingStore' import type { Settings } from '@comfyorg/settings-core/types' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { useNodeDefStore } from '@/stores/nodeDefStore' import NodeTooltip from './NodeTooltip.vue' diff --git a/src/components/graph/widgets/MultiSelectWidget.test.ts b/src/components/graph/widgets/MultiSelectWidget.test.ts index b0da67191da..f5c97ad6189 100644 --- a/src/components/graph/widgets/MultiSelectWidget.test.ts +++ b/src/components/graph/widgets/MultiSelectWidget.test.ts @@ -5,7 +5,7 @@ import { defineComponent, ref } from 'vue' import { createI18n } from 'vue-i18n' import enMessages from '@/locales/en/main.json' with { type: 'json' } -import type { ComboInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { ComboInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComponentWidget } from '@/types/domWidget' import MultiSelectWidget from './MultiSelectWidget.vue' diff --git a/src/components/graph/widgets/MultiSelectWidget.vue b/src/components/graph/widgets/MultiSelectWidget.vue index a4aa3a07675..6b485df59be 100644 --- a/src/components/graph/widgets/MultiSelectWidget.vue +++ b/src/components/graph/widgets/MultiSelectWidget.vue @@ -30,7 +30,7 @@ import { computed } from 'vue' import AppMultiSelect from '@/components/common/AppMultiSelect.vue' import type { SelectOption } from '@comfyorg/design-system/lib/select/types' -import type { ComboInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { ComboInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComponentWidget } from '@/types/domWidget' const selectedItems = defineModel({ required: true }) diff --git a/src/components/node/NodeHelpContent.test.ts b/src/components/node/NodeHelpContent.test.ts index 1b3c7580d9a..35f7aa8d819 100644 --- a/src/components/node/NodeHelpContent.test.ts +++ b/src/components/node/NodeHelpContent.test.ts @@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/vue' import { describe, expect, it, vi } from 'vitest' import { ref } from 'vue' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import { ComfyNodeDefImpl } from '@/core/graph/nodeDef/ComfyNodeDefImpl' import NodeHelpContent from './NodeHelpContent.vue' diff --git a/src/components/node/NodeHelpContent.vue b/src/components/node/NodeHelpContent.vue index 2aa160bdbf7..8747aab6052 100644 --- a/src/components/node/NodeHelpContent.vue +++ b/src/components/node/NodeHelpContent.vue @@ -75,7 +75,7 @@ import { computed } from 'vue' import SanitizedHtml from '@comfyorg/design-system/common/SanitizedHtml' import AppSpinner from '@/components/common/AppSpinner.vue' import { useNodeHelpContent } from '@/composables/useNodeHelpContent' -import { flattenInputSpecs } from '@/schemas/nodeDef/inputSpecUtil' +import { flattenInputSpecs } from '@/core/graph/nodeDef/inputSpecInterpreter' import type { ComfyNodeDefImpl } from '@/core/graph/nodeDef/ComfyNodeDefImpl' const { node } = defineProps<{ diff --git a/src/components/node/NodePreview.stories.ts b/src/components/node/NodePreview.stories.ts index f7a98f4d6f8..c0758e0460b 100644 --- a/src/components/node/NodePreview.stories.ts +++ b/src/components/node/NodePreview.stories.ts @@ -1,6 +1,6 @@ import type { Meta, StoryObj } from '@storybook/vue3-vite' -import type { ComfyNodeDef as ComfyNodeDefV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { ComfyNodeDef as ComfyNodeDefV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import NodePreview from './NodePreview.vue' diff --git a/src/components/node/NodePreview.test.ts b/src/components/node/NodePreview.test.ts index 24cc56ed500..f8f75842ab5 100644 --- a/src/components/node/NodePreview.test.ts +++ b/src/components/node/NodePreview.test.ts @@ -3,7 +3,7 @@ import { createI18n } from 'vue-i18n' import { render, screen } from '@testing-library/vue' -import type { ComfyNodeDef as ComfyNodeDefV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { ComfyNodeDef as ComfyNodeDefV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import * as markdownRendererUtil from '@/utils/markdownRendererUtil' import NodePreview from './NodePreview.vue' diff --git a/src/components/node/NodePreview.vue b/src/components/node/NodePreview.vue index d65cb7decf1..01cf38ab60a 100644 --- a/src/components/node/NodePreview.vue +++ b/src/components/node/NodePreview.vue @@ -95,8 +95,8 @@ import { computed } from 'vue' import SanitizedHtml from '@comfyorg/design-system/common/SanitizedHtml' import { useVueFeatureFlags } from '@/composables/useVueFeatureFlags' import LGraphNodePreview from '@/renderer/extensions/vueNodes/components/LGraphNodePreview.vue' -import type { ComfyNodeDef as ComfyNodeDefV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' -import { flattenInputSpecs } from '@/schemas/nodeDef/inputSpecUtil' +import type { ComfyNodeDef as ComfyNodeDefV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' +import { flattenInputSpecs } from '@/core/graph/nodeDef/inputSpecInterpreter' import { useWidgetStore } from '@/stores/widgetStore' import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore' import { renderMarkdownToHtml } from '@/utils/markdownRendererUtil' diff --git a/src/components/node/NodePreviewCard.test.ts b/src/components/node/NodePreviewCard.test.ts index 96e70321d29..660df75afbe 100644 --- a/src/components/node/NodePreviewCard.test.ts +++ b/src/components/node/NodePreviewCard.test.ts @@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/vue' import { describe, expect, it, vi } from 'vitest' import { createI18n } from 'vue-i18n' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import { ComfyNodeDefImpl } from '@/core/graph/nodeDef/ComfyNodeDefImpl' import NodePreviewCard from './NodePreviewCard.vue' diff --git a/src/components/node/NodePreviewCard.vue b/src/components/node/NodePreviewCard.vue index 7e516df846b..0d75e5f32e8 100644 --- a/src/components/node/NodePreviewCard.vue +++ b/src/components/node/NodePreviewCard.vue @@ -104,7 +104,7 @@ import { computed, ref } from 'vue' import NodePricingBadge from '@/components/node/NodePricingBadge.vue' import NodeProviderBadge from '@/components/node/NodeProviderBadge.vue' import LGraphNodePreview from '@/renderer/extensions/vueNodes/components/LGraphNodePreview.vue' -import { flattenInputSpecs } from '@/schemas/nodeDef/inputSpecUtil' +import { flattenInputSpecs } from '@/core/graph/nodeDef/inputSpecInterpreter' import type { ComfyNodeDefImpl } from '@/core/graph/nodeDef/ComfyNodeDefImpl' const BASE_WIDTH_PX = 200 diff --git a/src/components/node/renderNodePreview.ts b/src/components/node/renderNodePreview.ts index 003ba4e3606..15e71a0cae5 100644 --- a/src/components/node/renderNodePreview.ts +++ b/src/components/node/renderNodePreview.ts @@ -3,7 +3,7 @@ import { h, render } from 'vue' import NodePreview from '@/components/node/NodePreview.vue' import TooltipProvider from '@comfyorg/design-system/tooltip/TooltipProvider' -import type { ComfyNodeDef as ComfyNodeDefV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { ComfyNodeDef as ComfyNodeDefV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' export function renderNodePreview( container: HTMLElement, diff --git a/src/components/searchbox/v2/__test__/testUtils.ts b/src/components/searchbox/v2/__test__/testUtils.ts index 02d7aea4bd3..1ea6e66c839 100644 --- a/src/components/searchbox/v2/__test__/testUtils.ts +++ b/src/components/searchbox/v2/__test__/testUtils.ts @@ -1,5 +1,5 @@ import type { DetachedWindowAPI } from 'happy-dom' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { ComfyNodeDefImpl } from '@/core/graph/nodeDef/ComfyNodeDefImpl' export function createMockNodeDef( diff --git a/src/components/sidebar/tabs/nodeLibrary/EssentialNodeCard.test.ts b/src/components/sidebar/tabs/nodeLibrary/EssentialNodeCard.test.ts index 5b07312335a..3e6c5f3bfe3 100644 --- a/src/components/sidebar/tabs/nodeLibrary/EssentialNodeCard.test.ts +++ b/src/components/sidebar/tabs/nodeLibrary/EssentialNodeCard.test.ts @@ -6,7 +6,7 @@ import { createI18n } from 'vue-i18n' import { useNodeDragToCanvas } from '@/composables/node/useNodeDragToCanvas' import type { EssentialTile } from '@/constants/essentialsNodes' import { useSettingStore } from '@/platform/settings/settingStore' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import { useNodeDefStore } from '@/stores/nodeDefStore' import EssentialNodeCard from './EssentialNodeCard.vue' diff --git a/src/composables/node/useNodePricing.test.ts b/src/composables/node/useNodePricing.test.ts index c68f64f1858..b70e4074c8b 100644 --- a/src/composables/node/useNodePricing.test.ts +++ b/src/composables/node/useNodePricing.test.ts @@ -11,7 +11,7 @@ import { import { useNodePricing } from '@/composables/node/useNodePricing' import type { LGraphNode } from '@/lib/litegraph/src/litegraph' import { LiteGraph } from '@/lib/litegraph/src/litegraph' -import type { ComfyNodeDef, PriceBadge } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef, PriceBadge } from '@comfyorg/object-info-parser' import { toNodeId } from '@comfyorg/graph-model/nodeId' import { createMockLGraphNode } from '@/utils/__tests__/litegraphTestUtils' diff --git a/src/composables/node/useNodePricing.ts b/src/composables/node/useNodePricing.ts index 38c1dc8af1d..2081e6e797b 100644 --- a/src/composables/node/useNodePricing.ts +++ b/src/composables/node/useNodePricing.ts @@ -27,7 +27,7 @@ import { LiteGraph } from '@/lib/litegraph/src/litegraph' import type { LGraphNode } from '@/lib/litegraph/src/litegraph' import type { INodeInputSlot } from '@comfyorg/graph-model/slots' import type { IBaseWidget } from '@comfyorg/graph-model/widgets' -import type { PriceBadge } from '@/schemas/nodeDefSchema' +import type { PriceBadge } from '@comfyorg/object-info-parser' import { useNodeDefStore } from '@/stores/nodeDefStore' import type { NodeId } from '@comfyorg/graph-model/nodeId' diff --git a/src/core/graph/litegraphServiceAccess.ts b/src/core/graph/litegraphServiceAccess.ts index cc324573a6d..42a78b2aa4a 100644 --- a/src/core/graph/litegraphServiceAccess.ts +++ b/src/core/graph/litegraphServiceAccess.ts @@ -1,5 +1,5 @@ import type { LGraphNode } from '@/lib/litegraph/src/litegraph' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' interface LitegraphServiceAccess { addNodeInput(node: LGraphNode, inputSpec: InputSpec): void diff --git a/src/schemas/nodeDef/migration.test.ts b/src/core/graph/nodeDef/ComfyNodeDefImpl.test.ts similarity index 50% rename from src/schemas/nodeDef/migration.test.ts rename to src/core/graph/nodeDef/ComfyNodeDefImpl.test.ts index 4df52d50ac5..c9672d3b1f1 100644 --- a/src/schemas/nodeDef/migration.test.ts +++ b/src/core/graph/nodeDef/ComfyNodeDefImpl.test.ts @@ -1,282 +1,8 @@ import { describe, expect, it } from 'vitest' -import { - transformInputSpecV1ToV2, - transformInputSpecV2ToV1, - transformNodeDefV1ToV2 -} from '@/schemas/nodeDef/migration' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import { ComfyNodeDefImpl } from '@/core/graph/nodeDef/ComfyNodeDefImpl' -describe('NodeDef Migration', () => { - it('should correctly transform required input specs', () => { - const plainObject = { - required: { - intInput: ['INT', { min: 0, max: 100, default: 50 }], - stringInput: ['STRING', { default: 'Hello', multiline: true }] - } - } as ComfyNodeDefV1['input'] - - const nodeDef: ComfyNodeDefV1 = { - name: 'TestNode', - display_name: 'Test Node', - category: 'Testing', - python_module: 'test_module', - description: 'A test node', - input: plainObject, - output: [], - output_is_list: [], - output_name: [], - output_node: false - } - - const result = transformNodeDefV1ToV2(nodeDef) - - const intInput = result.inputs['intInput'] - const stringInput = result.inputs['stringInput'] - - expect(intInput.min).toBe(0) - expect(intInput.max).toBe(100) - expect(intInput.default).toBe(50) - expect(intInput.name).toBe('intInput') - expect(intInput.type).toBe('INT') - expect(stringInput.default).toBe('Hello') - expect(stringInput.multiline).toBe(true) - expect(stringInput.name).toBe('stringInput') - expect(stringInput.type).toBe('STRING') - }) - - it('should correctly transform optional input specs', () => { - const plainObject = { - optional: { - booleanInput: [ - 'BOOLEAN', - { default: true, labelOn: 'Yes', labelOff: 'No' } - ], - floatInput: ['FLOAT', { min: 0, max: 1, step: 0.1 }] - } - } as ComfyNodeDefV1['input'] - - const nodeDef: ComfyNodeDefV1 = { - name: 'TestNode', - display_name: 'Test Node', - category: 'Testing', - python_module: 'test_module', - description: 'A test node', - input: plainObject, - output: [], - output_is_list: [], - output_name: [], - output_node: false - } - - const result = transformNodeDefV1ToV2(nodeDef) - - const booleanInput = result.inputs['booleanInput'] - const floatInput = result.inputs['floatInput'] - - expect(booleanInput.default).toBe(true) - expect(booleanInput.labelOn).toBe('Yes') - expect(booleanInput.labelOff).toBe('No') - expect(booleanInput.type).toBe('BOOLEAN') - expect(booleanInput.isOptional).toBe(true) - expect(floatInput.min).toBe(0) - expect(floatInput.max).toBe(1) - expect(floatInput.step).toBe(0.1) - expect(floatInput.type).toBe('FLOAT') - expect(floatInput.isOptional).toBe(true) - }) - - it('should handle combo input specs', () => { - const plainObject = { - optional: { - comboInput: [[1, 2, 3], { default: 2 }] - } - } as ComfyNodeDefV1['input'] - - const nodeDef: ComfyNodeDefV1 = { - name: 'TestNode', - display_name: 'Test Node', - category: 'Testing', - python_module: 'test_module', - description: 'A test node', - input: plainObject, - output: [], - output_is_list: [], - output_name: [], - output_node: false - } - - const result = transformNodeDefV1ToV2(nodeDef) - expect(result.inputs['comboInput'].type).toBe('COMBO') - expect(result.inputs['comboInput'].default).toBe(2) - expect(result.inputs['comboInput'].options).toEqual([1, 2, 3]) - }) - - it('should handle combo input specs (auto-default)', () => { - const plainObject = { - optional: { - comboInput: [[1, 2, 3], {}] - } - } as ComfyNodeDefV1['input'] - - const nodeDef: ComfyNodeDefV1 = { - name: 'TestNode', - display_name: 'Test Node', - category: 'Testing', - python_module: 'test_module', - description: 'A test node', - input: plainObject, - output: [], - output_is_list: [], - output_name: [], - output_node: false - } - - const result = transformNodeDefV1ToV2(nodeDef) - expect(result.inputs['comboInput'].type).toBe('COMBO') - // Should pick the first choice as default - expect(result.inputs['comboInput'].options).toEqual([1, 2, 3]) - }) - - it('should handle custom input specs', () => { - const plainObject = { - optional: { - customInput: ['CUSTOM_TYPE', { default: 'custom value' }] - } - } as ComfyNodeDefV1['input'] - - const nodeDef: ComfyNodeDefV1 = { - name: 'TestNode', - display_name: 'Test Node', - category: 'Testing', - python_module: 'test_module', - description: 'A test node', - input: plainObject, - output: [], - output_is_list: [], - output_name: [], - output_node: false - } - - const result = transformNodeDefV1ToV2(nodeDef) - expect(result.inputs['customInput'].type).toBe('CUSTOM_TYPE') - expect(result.inputs['customInput'].default).toBe('custom value') - }) - - it('should map CHART option type to chartType', () => { - const plainObject = { - optional: { - chartInput: ['CHART', { type: 'bar', data: { labels: [] } }] - } - } as ComfyNodeDefV1['input'] - - const nodeDef: ComfyNodeDefV1 = { - name: 'TestNode', - display_name: 'Test Node', - category: 'Testing', - python_module: 'test_module', - description: 'A test node', - input: plainObject, - output: [], - output_is_list: [], - output_name: [], - output_node: false - } - - const result = transformNodeDefV1ToV2(nodeDef) - const chartInput = result.inputs['chartInput'] - expect(chartInput.type).toBe('CHART') - expect(chartInput).toMatchObject({ chartType: 'bar', data: { labels: [] } }) - }) - - it('should default a dynamic combo with no supplied options to an empty options array', () => { - // Synthetic subgraph-blueprint nodedefs (subgraphStore.ts) promote a - // boundary input's type into a bare [type, undefined] tuple. - const result = transformInputSpecV1ToV2( - ['COMFY_DYNAMICCOMBO_V3', undefined], - { name: 'model' } - ) - - expect(result.type).toBe('COMFY_DYNAMICCOMBO_V3') - expect(result.options).toEqual([]) - }) - - it('should transform an input spec without options', () => { - const result = transformInputSpecV1ToV2(['PREVIEW_3D'], { name: 'image' }) - - expect(result).toEqual({ - type: 'PREVIEW_3D', - name: 'image', - isOptional: false - }) - }) - - it('should preserve chartType across a V2 to V1 round trip', () => { - const inputSpec = transformInputSpecV1ToV2(['CHART', { type: 'bar' }], { - name: 'chartInput' - }) - - const result = transformInputSpecV1ToV2( - transformInputSpecV2ToV1(inputSpec), - { name: 'chartInput' } - ) - - expect(result.chartType).toBe('bar') - }) - - it('should not transform hidden fields', () => { - const plainObject: NonNullable = { - hidden: { - someHiddenValue: 42, - anotherHiddenValue: { nested: 'object' } - } - } - - const nodeDef: ComfyNodeDefV1 = { - name: 'TestNode', - display_name: 'Test Node', - category: 'Testing', - python_module: 'test_module', - description: 'A test node', - input: plainObject, - output: [], - output_is_list: [], - output_name: [], - output_node: false - } - - const result = transformNodeDefV1ToV2(nodeDef) - - expect(result.hidden).toEqual(plainObject.hidden) - expect(result.hidden?.someHiddenValue).toBe(42) - expect(result.hidden?.anotherHiddenValue).toEqual({ nested: 'object' }) - }) - - it('should handle empty or undefined fields', () => { - const plainObject = {} - - const nodeDef: ComfyNodeDefV1 = { - name: 'TestNode', - display_name: 'Test Node', - category: 'Testing', - python_module: 'test_module', - description: 'A test node', - input: plainObject, - output: [], - output_is_list: [], - output_name: [], - output_node: false - } - - const result = transformNodeDefV1ToV2(nodeDef) - - expect(result).toBeDefined() - expect(result.inputs).toEqual({}) - expect(result.hidden).toBeUndefined() - }) -}) - describe('ComfyNodeDefImpl', () => { it('should transform a basic node definition correctly', () => { const plainObject = { diff --git a/src/core/graph/nodeDef/ComfyNodeDefImpl.ts b/src/core/graph/nodeDef/ComfyNodeDefImpl.ts index d45cd21232c..a7c43f3ceb1 100644 --- a/src/core/graph/nodeDef/ComfyNodeDefImpl.ts +++ b/src/core/graph/nodeDef/ComfyNodeDefImpl.ts @@ -4,19 +4,19 @@ import { resolveNodeDefText } from '@/i18n' import { collectSearchableInputTypes, collectSearchableOutputTypes -} from '@/schemas/nodeDef/searchableSlotTypes' -import { transformNodeDefV1ToV2 } from '@/schemas/nodeDef/migration' +} from '@/core/graph/nodeDef/inputSpecInterpreter' +import { transformNodeDefV1ToV2 } from '@comfyorg/object-info-parser/migration' import type { ComfyNodeDef as ComfyNodeDefV2, InputSpec as InputSpecV2, OutputSpec as OutputSpecV2 -} from '@/schemas/nodeDef/nodeDefSchemaV2' +} from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyInputsSpec as ComfyInputSpecV1, ComfyNodeDef as ComfyNodeDefV1, ComfyOutputTypesSpec as ComfyOutputSpecV1, PriceBadge -} from '@/schemas/nodeDefSchema' +} from '@comfyorg/object-info-parser' import { NODE_TO_ESSENTIALS_CATEGORY } from '@/constants/essentialsNodes' import { useNodeFrequencyStore } from '@/stores/nodeFrequencyStore' import { CORE_NODE_MODULES, getNodeSource } from '@/types/nodeSource' diff --git a/src/schemas/nodeDef/inputSpecTree.cap.test.ts b/src/core/graph/nodeDef/inputSpecInterpreter.cap.test.ts similarity index 84% rename from src/schemas/nodeDef/inputSpecTree.cap.test.ts rename to src/core/graph/nodeDef/inputSpecInterpreter.cap.test.ts index 484a7b5ca01..377f9a279ba 100644 --- a/src/schemas/nodeDef/inputSpecTree.cap.test.ts +++ b/src/core/graph/nodeDef/inputSpecInterpreter.cap.test.ts @@ -1,9 +1,12 @@ import { expect, it } from 'vitest' import { reportError } from '@comfyorg/telemetry/reportError' -import { inputSpecTree, ownSlotTypes } from '@/schemas/nodeDef/inputSpecTree' -import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration' -import type { InputSpec as InputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' +import { + inputSpecTree, + ownSlotTypes +} from '@/core/graph/nodeDef/inputSpecInterpreter' +import { transformInputSpecV1ToV2 } from '@comfyorg/object-info-parser/migration' +import type { InputSpec as InputSpecV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' it('reports the first 10 unique locations and suppresses the 11th', () => { const locations: Array<{ diff --git a/src/schemas/nodeDef/inputSpecTree.test.ts b/src/core/graph/nodeDef/inputSpecInterpreter.test.ts similarity index 90% rename from src/schemas/nodeDef/inputSpecTree.test.ts rename to src/core/graph/nodeDef/inputSpecInterpreter.test.ts index 3dd359a2d46..3c1d8215d99 100644 --- a/src/schemas/nodeDef/inputSpecTree.test.ts +++ b/src/core/graph/nodeDef/inputSpecInterpreter.test.ts @@ -1,10 +1,13 @@ import { describe, expect, it, vi } from 'vitest' import { reportError } from '@comfyorg/telemetry/reportError' -import { inputSpecTree, ownSlotTypes } from '@/schemas/nodeDef/inputSpecTree' -import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration' -import type { InputSpec as InputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' -import type { InputSpec } from '@/schemas/nodeDefSchema' +import { + inputSpecTree, + ownSlotTypes +} from '@/core/graph/nodeDef/inputSpecInterpreter' +import { transformInputSpecV1ToV2 } from '@comfyorg/object-info-parser/migration' +import type { InputSpec as InputSpecV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser' interface BadSpecScenario { name: string diff --git a/src/schemas/nodeDef/inputSpecTree.ts b/src/core/graph/nodeDef/inputSpecInterpreter.ts similarity index 78% rename from src/schemas/nodeDef/inputSpecTree.ts rename to src/core/graph/nodeDef/inputSpecInterpreter.ts index ba4acd97ea1..3e916bb6f3a 100644 --- a/src/schemas/nodeDef/inputSpecTree.ts +++ b/src/core/graph/nodeDef/inputSpecInterpreter.ts @@ -1,6 +1,6 @@ import { reportError } from '@comfyorg/telemetry/reportError' -import { createInputSpecInterpreter } from '@/schemas/nodeDef/inputSpecInterpreter' -import type { InputSpecDiagnosticSink } from '@/schemas/nodeDef/inputSpecInterpreter' +import { createInputSpecInterpreter } from '@comfyorg/object-info-parser/inputSpecInterpreter' +import type { InputSpecDiagnosticSink } from '@comfyorg/object-info-parser/inputSpecInterpreter' const MAX_SPEC_DRIFT_REPORTS = 10 const reportedSpecDrift = new Set() @@ -34,10 +34,11 @@ const warnSpecDrift: InputSpecDiagnosticSink = (spec, error, optionIndex) => { } export const { - splitSlotTypes, inputSpecTree, ownSlotTypes, dynamicComboOptionKeys, dynamicComboOptionTypes, - matchTypeTemplate + flattenInputSpecs, + collectSearchableInputTypes, + collectSearchableOutputTypes } = createInputSpecInterpreter(warnSpecDrift) diff --git a/src/core/graph/widgets/__fixtures__/dynamicInputHelpers.ts b/src/core/graph/widgets/__fixtures__/dynamicInputHelpers.ts index 12298b1cd6c..1b042c4d84b 100644 --- a/src/core/graph/widgets/__fixtures__/dynamicInputHelpers.ts +++ b/src/core/graph/widgets/__fixtures__/dynamicInputHelpers.ts @@ -1,6 +1,6 @@ import type { LGraphNode } from '@/lib/litegraph/src/litegraph' -import type { InputSpec } from '@/schemas/nodeDefSchema' -import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration' +import type { InputSpec } from '@comfyorg/object-info-parser' +import { transformInputSpecV1ToV2 } from '@comfyorg/object-info-parser/migration' import { useLitegraphService } from '@/services/litegraphService' type MockInputs = ('INT' | 'STRING' | 'IMAGE' | MockInputs)[][] diff --git a/src/core/graph/widgets/autogrowConvertToSubgraph.test.ts b/src/core/graph/widgets/autogrowConvertToSubgraph.test.ts index 2dc280b009d..c157c7c791a 100644 --- a/src/core/graph/widgets/autogrowConvertToSubgraph.test.ts +++ b/src/core/graph/widgets/autogrowConvertToSubgraph.test.ts @@ -11,7 +11,7 @@ import { SUBGRAPH_INPUT_ID } from '@/lib/litegraph/src/constants' import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' import type { SubgraphNode } from '@/lib/litegraph/src/litegraph' import { enableSubgraphNodeCreation } from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import { useLitegraphService } from '@/services/litegraphService' const AUTOGROW_NODE_TYPE = 'test/AutogrowThenPlainInputs' diff --git a/src/core/graph/widgets/dynamicGroupWidget.test.ts b/src/core/graph/widgets/dynamicGroupWidget.test.ts index b2f238dd31a..7fe658ba210 100644 --- a/src/core/graph/widgets/dynamicGroupWidget.test.ts +++ b/src/core/graph/widgets/dynamicGroupWidget.test.ts @@ -28,7 +28,7 @@ import { createTestSubgraphNode } from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers' import { useNodeDefStore } from '@/stores/nodeDefStore' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { graphToPrompt } from '@/utils/executionUtil' import { isWidgetVisibleOnSurface } from '@/types/widgetVisibility' import { renameWidget } from '@/utils/widgetUtil' diff --git a/src/core/graph/widgets/dynamicGroupWidget.ts b/src/core/graph/widgets/dynamicGroupWidget.ts index 8ae1f55f585..4a6c6605e98 100644 --- a/src/core/graph/widgets/dynamicGroupWidget.ts +++ b/src/core/graph/widgets/dynamicGroupWidget.ts @@ -14,9 +14,9 @@ import { getWidgetIds, resolveNodeRootGraphId } from '@/lib/litegraph/src/utils/widget' -import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration' -import type { InputSpec } from '@/schemas/nodeDefSchema' -import { zDynamicGroupInputSpec } from '@/schemas/nodeDefSchema' +import { transformInputSpecV1ToV2 } from '@comfyorg/object-info-parser/migration' +import type { InputSpec } from '@comfyorg/object-info-parser' +import { zDynamicGroupInputSpec } from '@comfyorg/object-info-parser' import { useLitegraphServiceAccess } from '@/core/graph/litegraphServiceAccess' import { useNodeDefStore } from '@/stores/nodeDefStore' import { useWidgetValueStore } from '@/stores/widgetValueStore' diff --git a/src/core/graph/widgets/dynamicInputSpec.test.ts b/src/core/graph/widgets/dynamicInputSpec.test.ts index 3c187f21b4a..8f23999b903 100644 --- a/src/core/graph/widgets/dynamicInputSpec.test.ts +++ b/src/core/graph/widgets/dynamicInputSpec.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from 'vitest' -import type { ComfyInputsSpec, InputSpec } from '@/schemas/nodeDefSchema' -import { zDynamicGroupInputSpec } from '@/schemas/nodeDefSchema' +import type { ComfyInputsSpec, InputSpec } from '@comfyorg/object-info-parser' +import { zDynamicGroupInputSpec } from '@comfyorg/object-info-parser' import { resolveDynamicInputSpec } from './dynamicInputSpec' diff --git a/src/core/graph/widgets/dynamicInputSpec.ts b/src/core/graph/widgets/dynamicInputSpec.ts index 82be4e998b5..a70b1f878a8 100644 --- a/src/core/graph/widgets/dynamicInputSpec.ts +++ b/src/core/graph/widgets/dynamicInputSpec.ts @@ -1,8 +1,8 @@ import { zDynamicComboInputSpec, zDynamicGroupInputSpec -} from '@/schemas/nodeDefSchema' -import type { ComfyInputsSpec, InputSpec } from '@/schemas/nodeDefSchema' +} from '@comfyorg/object-info-parser' +import type { ComfyInputsSpec, InputSpec } from '@comfyorg/object-info-parser' import type { WidgetValue } from '@/types/simplifiedWidget' export function resolveDynamicInputSpec( diff --git a/src/core/graph/widgets/dynamicInputsConvertToSubgraph.test.ts b/src/core/graph/widgets/dynamicInputsConvertToSubgraph.test.ts index e88dee66b6d..c6260222e8b 100644 --- a/src/core/graph/widgets/dynamicInputsConvertToSubgraph.test.ts +++ b/src/core/graph/widgets/dynamicInputsConvertToSubgraph.test.ts @@ -14,7 +14,7 @@ import { enableSubgraphNodeCreation, resetSubgraphFixtureState } from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import { useLitegraphService } from '@/services/litegraphService' const GPT_IMAGE_TYPE = 'test/FE3463GPTImage' diff --git a/src/core/graph/widgets/dynamicWidgets.test.ts b/src/core/graph/widgets/dynamicWidgets.test.ts index ece7095df46..43d9eb32b29 100644 --- a/src/core/graph/widgets/dynamicWidgets.test.ts +++ b/src/core/graph/widgets/dynamicWidgets.test.ts @@ -16,7 +16,7 @@ import { liveAutogrowGroupOf } from '@/core/graph/widgets/dynamicWidgets' import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' import { realignGroupWidgetChildLinks } from '@/lib/litegraph/src/linkDeduplication' import type { SerialisableGraph } from '@comfyorg/graph-model/serialisation' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import { useLitegraphService } from '@/services/litegraphService' import { useLinkStore } from '@/stores/linkStore' import { toLinkId } from '@comfyorg/graph-model/linkId' diff --git a/src/core/graph/widgets/dynamicWidgets.ts b/src/core/graph/widgets/dynamicWidgets.ts index aae3efbf322..3aef8b4fd62 100644 --- a/src/core/graph/widgets/dynamicWidgets.ts +++ b/src/core/graph/widgets/dynamicWidgets.ts @@ -13,14 +13,14 @@ import { getWidgetIds, resolveNodeRootGraphId } from '@/lib/litegraph/src/utils/widget' -import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration' -import type { ComboInputSpec, InputSpec } from '@/schemas/nodeDefSchema' -import type { InputSpec as InputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' +import { transformInputSpecV1ToV2 } from '@comfyorg/object-info-parser/migration' +import type { ComboInputSpec, InputSpec } from '@comfyorg/object-info-parser' +import type { InputSpec as InputSpecV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import { zAutogrowOptions, zDynamicComboInputSpec, zMatchTypeOptions -} from '@/schemas/nodeDefSchema' +} from '@comfyorg/object-info-parser' import { useLitegraphServiceAccess } from '@/core/graph/litegraphServiceAccess' import { useApp } from '@/scripts/appInstance' import type { ComfyApp } from '@/types/comfy' diff --git a/src/core/graph/widgets/matchTypeConfiguring.test.ts b/src/core/graph/widgets/matchTypeConfiguring.test.ts index 2083adc6201..30e5b1d934f 100644 --- a/src/core/graph/widgets/matchTypeConfiguring.test.ts +++ b/src/core/graph/widgets/matchTypeConfiguring.test.ts @@ -3,7 +3,7 @@ import { describe, expect, test } from 'vitest' import { effect, stop } from 'vue' import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' -import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration' +import { transformInputSpecV1ToV2 } from '@comfyorg/object-info-parser/migration' import { app } from '@/scripts/app' import { useLitegraphService } from '@/services/litegraphService' diff --git a/src/core/graph/widgets/matchTypeFallback.test.ts b/src/core/graph/widgets/matchTypeFallback.test.ts index d3f3ca1b17f..187de13e0e8 100644 --- a/src/core/graph/widgets/matchTypeFallback.test.ts +++ b/src/core/graph/widgets/matchTypeFallback.test.ts @@ -1,8 +1,8 @@ import { describe, expect, it } from 'vitest' import { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph' -import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration' -import type { InputSpec } from '@/schemas/nodeDefSchema' +import { transformInputSpecV1ToV2 } from '@comfyorg/object-info-parser/migration' +import type { InputSpec } from '@comfyorg/object-info-parser' import { useLitegraphService } from '@/services/litegraphService' function testNode() { diff --git a/src/core/graph/widgets/revealDynamicInputSlot.test.ts b/src/core/graph/widgets/revealDynamicInputSlot.test.ts index 4228e0aed41..8dd53be58d4 100644 --- a/src/core/graph/widgets/revealDynamicInputSlot.test.ts +++ b/src/core/graph/widgets/revealDynamicInputSlot.test.ts @@ -2,8 +2,8 @@ import { describe, expect, it } from 'vitest' import { revealDynamicInputSlot } from '@/core/graph/widgets/revealDynamicInputSlot' import { LGraphNode } from '@/lib/litegraph/src/litegraph' -import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration' -import type { InputSpec } from '@/schemas/nodeDefSchema' +import { transformInputSpecV1ToV2 } from '@comfyorg/object-info-parser/migration' +import type { InputSpec } from '@comfyorg/object-info-parser' import { useLitegraphService } from '@/services/litegraphService' const defaultOptions = [ diff --git a/src/core/graph/widgets/revealDynamicInputSlot.ts b/src/core/graph/widgets/revealDynamicInputSlot.ts index ec6b96b3318..f5ce9b4e2d5 100644 --- a/src/core/graph/widgets/revealDynamicInputSlot.ts +++ b/src/core/graph/widgets/revealDynamicInputSlot.ts @@ -1,12 +1,12 @@ import { isEqual } from 'es-toolkit' import type { LGraphNode } from '@/lib/litegraph/src/litegraph' -import type { InputSpec as InputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec as InputSpecV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { IBaseWidget } from '@comfyorg/graph-model/widgets' import { dynamicComboOptionTypes, inputSpecTree -} from '@/schemas/nodeDef/inputSpecTree' +} from '@/core/graph/nodeDef/inputSpecInterpreter' /** * Select DynamicCombo options so that `node` exposes a socket of `wantedType`. diff --git a/src/core/graph/widgets/valueControlWidgets.controlAfterGenerateName.test.ts b/src/core/graph/widgets/valueControlWidgets.controlAfterGenerateName.test.ts index 07c602790c0..9c45c474a69 100644 --- a/src/core/graph/widgets/valueControlWidgets.controlAfterGenerateName.test.ts +++ b/src/core/graph/widgets/valueControlWidgets.controlAfterGenerateName.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from 'vitest' import { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph' -import type { InputSpec, IntInputSpec } from '@/schemas/nodeDefSchema' +import type { InputSpec, IntInputSpec } from '@comfyorg/object-info-parser' import { CONTROL_OPTIONS } from '@/types/simplifiedWidget' import { addValueControlWidget, diff --git a/src/core/graph/widgets/valueControlWidgets.ts b/src/core/graph/widgets/valueControlWidgets.ts index 2332b8d766c..3416406ecb5 100644 --- a/src/core/graph/widgets/valueControlWidgets.ts +++ b/src/core/graph/widgets/valueControlWidgets.ts @@ -7,7 +7,7 @@ import type { IStringWidget } from '@comfyorg/graph-model/widgets' import { useSettingStore } from '@/platform/settings/settingStore' -import type { InputSpec } from '@/schemas/nodeDefSchema' +import type { InputSpec } from '@comfyorg/object-info-parser' import { CONTROL_OPTIONS } from '@/types/simplifiedWidget' import { IS_CONTROL_WIDGET } from './controlWidgetMarker' diff --git a/src/extensions/core/customWidgets.clone.test.ts b/src/extensions/core/customWidgets.clone.test.ts index 62502d75966..a03d55c63ea 100644 --- a/src/extensions/core/customWidgets.clone.test.ts +++ b/src/extensions/core/customWidgets.clone.test.ts @@ -1,7 +1,7 @@ import { beforeAll, beforeEach, describe, expect, it } from 'vitest' import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { app } from '@/scripts/app' import { customWidgetsExtension } from './customWidgets' diff --git a/src/extensions/core/customWidgets.numericOptions.test.ts b/src/extensions/core/customWidgets.numericOptions.test.ts index 50210590bf7..7e98bae328c 100644 --- a/src/extensions/core/customWidgets.numericOptions.test.ts +++ b/src/extensions/core/customWidgets.numericOptions.test.ts @@ -7,8 +7,8 @@ import type { INumericWidget } from '@comfyorg/graph-model/widgets' import { getWidgetStep } from '@/lib/litegraph/src/utils/widget' import { useSettingStore } from '@/platform/settings/settingStore' import type { Settings } from '@comfyorg/settings-core/types' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { app } from '@/scripts/app' import { customWidgetsExtension } from './customWidgets' diff --git a/src/extensions/core/customWidgets.subgraphPromotion.test.ts b/src/extensions/core/customWidgets.subgraphPromotion.test.ts index fc82660b89d..ac7881d50b3 100644 --- a/src/extensions/core/customWidgets.subgraphPromotion.test.ts +++ b/src/extensions/core/customWidgets.subgraphPromotion.test.ts @@ -7,7 +7,7 @@ import { createTestSubgraphNode, resetSubgraphFixtureState } from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { app } from '@/scripts/app' import { useWidgetValueStore } from '@/stores/widgetValueStore' import { graphToPrompt } from '@/utils/executionUtil' diff --git a/src/extensions/core/customWidgets.ts b/src/extensions/core/customWidgets.ts index 39600f450be..5feafb2d185 100644 --- a/src/extensions/core/customWidgets.ts +++ b/src/extensions/core/customWidgets.ts @@ -6,7 +6,7 @@ import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode' import type { LLink } from '@/lib/litegraph/src/litegraph' import type { IBaseWidget } from '@comfyorg/graph-model/widgets' import { BaseWidget } from '@/lib/litegraph/src/widgets/BaseWidget' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { app } from '@/scripts/app' import { GET_CONFIG } from '@comfyorg/graph-model/widgets' import { useWidgetValueStore } from '@/stores/widgetValueStore' diff --git a/src/extensions/core/groupNode.test.ts b/src/extensions/core/groupNode.test.ts index f450a2f1209..b3fb425ba06 100644 --- a/src/extensions/core/groupNode.test.ts +++ b/src/extensions/core/groupNode.test.ts @@ -9,7 +9,7 @@ import type { LGraph } from '@/lib/litegraph/src/litegraph' import { LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' import type { ComfyNode } from '@comfyorg/graph-model/workflowSchema' import { useMissingNodesErrorStore } from '@/platform/workflowErrors/nodeReplacement/missingNodesErrorStore' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { app } from '@/scripts/app' import { ComfyWidgets } from '@/scripts/widgets' import { useLitegraphService } from '@/services/litegraphService' diff --git a/src/extensions/core/groupNode.ts b/src/extensions/core/groupNode.ts index 5ca3d32800b..2147e1316d8 100644 --- a/src/extensions/core/groupNode.ts +++ b/src/extensions/core/groupNode.ts @@ -21,7 +21,7 @@ import type { ComfyNodeDef, ComfyOutputTypesSpec, InputSpec -} from '@/schemas/nodeDefSchema' +} from '@comfyorg/object-info-parser' import { useNodeDefStore } from '@/stores/nodeDefStore' import { useWidgetStore } from '@/stores/widgetStore' import type { ComfyExtension } from '@/types/comfy' diff --git a/src/extensions/core/load3d/load3dLazy.test.ts b/src/extensions/core/load3d/load3dLazy.test.ts index 86ca19c7b41..a207775f281 100644 --- a/src/extensions/core/load3d/load3dLazy.test.ts +++ b/src/extensions/core/load3d/load3dLazy.test.ts @@ -4,8 +4,8 @@ import { describe, expect, it, vi } from 'vitest' import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode' import { useExtensionService } from '@/platform/extensions/services/extensionService' import { useCommandStore } from '@/platform/keybindings/commandStore' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' import { useTopbarBadgeStore } from '@/stores/topbarBadgeStore' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' const lazyModules = vi.hoisted(() => { const defineExtension = (name: string) => ({ diff --git a/src/extensions/core/load3d/load3dLazy.ts b/src/extensions/core/load3d/load3dLazy.ts index 1c0c0e2eb3f..a3ec2d9d46d 100644 --- a/src/extensions/core/load3d/load3dLazy.ts +++ b/src/extensions/core/load3d/load3dLazy.ts @@ -1,5 +1,5 @@ import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { reportError } from '@comfyorg/telemetry/reportError' import { app } from '@/scripts/app' import { useExtensionService } from '@/platform/extensions/services/extensionService' diff --git a/src/extensions/core/load3d/load3dWidgets.ts b/src/extensions/core/load3d/load3dWidgets.ts index 26309b0efa5..05603fd54d9 100644 --- a/src/extensions/core/load3d/load3dWidgets.ts +++ b/src/extensions/core/load3d/load3dWidgets.ts @@ -9,7 +9,7 @@ import { t } from '@/i18n' import { reportError } from '@comfyorg/telemetry/reportError' import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode' import type { IStringWidget } from '@comfyorg/graph-model/widgets' -import type { CustomInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { CustomInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import { api } from '@/scripts/api' import { ComponentWidgetImpl, addWidget } from '@/scripts/domWidget' import type { CustomComfyWidgetConstructor } from '@/types/comfy' diff --git a/src/extensions/core/maskeditor.test.ts b/src/extensions/core/maskeditor.test.ts index a5890b4ab47..dc8ddc76272 100644 --- a/src/extensions/core/maskeditor.test.ts +++ b/src/extensions/core/maskeditor.test.ts @@ -8,7 +8,7 @@ import type { } from '@/lib/litegraph/src/litegraph' import { LGraphNode } from '@/lib/litegraph/src/litegraph' import type { ContextMenuDivElement } from '@/lib/litegraph/src/types/contextMenu' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { ComfyApp, app } from '@/scripts/app' import { createMockLGraphNode } from '@/utils/__tests__/litegraphTestUtils' import { filterUnavailableCoreMediaMenuActions } from '@/utils/coreMediaMenuActionUtils' diff --git a/src/extensions/core/previewAny.ts b/src/extensions/core/previewAny.ts index 59721f3e972..73f08befcee 100644 --- a/src/extensions/core/previewAny.ts +++ b/src/extensions/core/previewAny.ts @@ -9,7 +9,7 @@ import { addTextPreviewWidgets, updateTextPreviewWidgets } from '@/extensions/core/textPreviewWidgets' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { app } from '@/scripts/app' import { getNodeByLocatorId } from '@/utils/graphTraversalUtil' diff --git a/src/extensions/core/saveImageExtraOutput.test.ts b/src/extensions/core/saveImageExtraOutput.test.ts index be3c6c3a473..71e4f2d9b60 100644 --- a/src/extensions/core/saveImageExtraOutput.test.ts +++ b/src/extensions/core/saveImageExtraOutput.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it, vi } from 'vitest' import { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import type { ComfyExtension } from '@/types/comfy' vi.mock(import('@/scripts/app')) diff --git a/src/extensions/core/saveImageExtraOutput.ts b/src/extensions/core/saveImageExtraOutput.ts index db2b2af6531..ccb4b6c8193 100644 --- a/src/extensions/core/saveImageExtraOutput.ts +++ b/src/extensions/core/saveImageExtraOutput.ts @@ -1,5 +1,5 @@ import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { applyTextReplacements } from '@/utils/searchAndReplace' import { app } from '@/scripts/app' diff --git a/src/extensions/core/slotDefaultTypes.test.ts b/src/extensions/core/slotDefaultTypes.test.ts index 1e44f3d617b..375d86b8adb 100644 --- a/src/extensions/core/slotDefaultTypes.test.ts +++ b/src/extensions/core/slotDefaultTypes.test.ts @@ -1,7 +1,10 @@ import { describe, expect, it } from 'vitest' import { collectRegistrableSlotTypes } from '@/extensions/core/slotDefaultTypes' -import type { ComfyNodeDef, ComfyInputsSpec } from '@/schemas/nodeDefSchema' +import type { + ComfyNodeDef, + ComfyInputsSpec +} from '@comfyorg/object-info-parser' function nodeDef( input: ComfyInputsSpec, diff --git a/src/extensions/core/slotDefaultTypes.ts b/src/extensions/core/slotDefaultTypes.ts index 6154e56a7f2..bc8a3844387 100644 --- a/src/extensions/core/slotDefaultTypes.ts +++ b/src/extensions/core/slotDefaultTypes.ts @@ -1,8 +1,11 @@ -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' -import type { InputSpec as InputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' -import { inputSpecTree, ownSlotTypes } from '@/schemas/nodeDef/inputSpecTree' -import { transformNodeDefV1ToV2 } from '@/schemas/nodeDef/migration' -import { collectSearchableOutputTypes } from '@/schemas/nodeDef/searchableSlotTypes' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' +import type { InputSpec as InputSpecV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' +import { + collectSearchableOutputTypes, + inputSpecTree, + ownSlotTypes +} from '@/core/graph/nodeDef/inputSpecInterpreter' +import { transformNodeDefV1ToV2 } from '@comfyorg/object-info-parser/migration' import { ComfyWidgets } from '@/scripts/widgets' diff --git a/src/extensions/core/slotDefaults.ts b/src/extensions/core/slotDefaults.ts index 181fb6d700c..c02b6671d5d 100644 --- a/src/extensions/core/slotDefaults.ts +++ b/src/extensions/core/slotDefaults.ts @@ -3,7 +3,7 @@ import type { SlotTypeDefaultNodeOpts } from '@/lib/litegraph/src/LiteGraphGloba import { LiteGraph } from '@/lib/litegraph/src/litegraph' import { collectRegistrableSlotTypes } from '@/extensions/core/slotDefaultTypes' import { reportError } from '@comfyorg/telemetry/reportError' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import type { ComfyExtension } from '@/types/comfy' import { app } from '@/scripts/app' diff --git a/src/extensions/core/textPreviewWidgets.ts b/src/extensions/core/textPreviewWidgets.ts index 9df169a7410..b98e4830946 100644 --- a/src/extensions/core/textPreviewWidgets.ts +++ b/src/extensions/core/textPreviewWidgets.ts @@ -2,7 +2,7 @@ import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode' import { resolveNodeRootGraphId } from '@/lib/litegraph/src/litegraph' import WidgetTextPreview from '@/renderer/extensions/vueNodes/widgets/components/WidgetTextPreview.vue' import type { NodeExecutionOutput } from '@comfyorg/api-client/executionTypes' -import type { CustomInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { CustomInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import { app } from '@/scripts/app' import { ComponentWidgetImpl, addWidget } from '@/scripts/domWidget' import { ComfyWidgets } from '@/scripts/widgets' diff --git a/src/extensions/core/uploadAudio.ts b/src/extensions/core/uploadAudio.ts index adfa89a8507..3d03f7bbe6e 100644 --- a/src/extensions/core/uploadAudio.ts +++ b/src/extensions/core/uploadAudio.ts @@ -14,7 +14,7 @@ import { splitFilePath } from '@/renderer/extensions/vueNodes/widgets/utils/audioUtils' import type { NodeExecutionOutput } from '@comfyorg/api-client/executionTypes' -import type { ComfyNodeDef, InputSpec } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef, InputSpec } from '@comfyorg/object-info-parser' import type { DOMWidget } from '@/types/domWidget' import { useAudioService } from '@/services/audioService' import type { NodeLocatorId } from '@/types' diff --git a/src/extensions/core/uploadImage.ts b/src/extensions/core/uploadImage.ts index 95b3f2686f7..1c8c8adbc2f 100644 --- a/src/extensions/core/uploadImage.ts +++ b/src/extensions/core/uploadImage.ts @@ -1,6 +1,6 @@ import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode' -import { isMediaUploadComboInput } from '@/schemas/nodeDefSchema' -import type { ComfyNodeDef, InputSpec } from '@/schemas/nodeDefSchema' +import { isMediaUploadComboInput } from '@comfyorg/object-info-parser' +import type { ComfyNodeDef, InputSpec } from '@comfyorg/object-info-parser' import type { ComfyExtension } from '@/types/comfy' // Adds an upload button to the nodes diff --git a/src/extensions/core/widgetInputs.refreshCombo.test.ts b/src/extensions/core/widgetInputs.refreshCombo.test.ts index 670cf735832..1c2077972e2 100644 --- a/src/extensions/core/widgetInputs.refreshCombo.test.ts +++ b/src/extensions/core/widgetInputs.refreshCombo.test.ts @@ -3,7 +3,7 @@ import { describe, expect, it, vi } from 'vitest' import type { LGraph, LLink } from '@/lib/litegraph/src/litegraph' import type { IBaseWidget } from '@comfyorg/graph-model/widgets' -import type { ComfyNodeDef, InputSpec } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef, InputSpec } from '@comfyorg/object-info-parser' import { GET_CONFIG } from '@comfyorg/graph-model/widgets' import { useLinkStore } from '@/stores/linkStore' import { graphScopeOf } from '@comfyorg/graph-model/graphScopeId' diff --git a/src/extensions/core/widgetInputs.test.ts b/src/extensions/core/widgetInputs.test.ts index a8f4bb8de3e..408e6d7e8b0 100644 --- a/src/extensions/core/widgetInputs.test.ts +++ b/src/extensions/core/widgetInputs.test.ts @@ -15,7 +15,7 @@ import type { import type { IBaseWidget } from '@comfyorg/graph-model/widgets' import { LegacyWidget } from '@/lib/litegraph/src/widgets/LegacyWidget' import { assetService } from '@/platform/assets/services/assetService' -import type { ComfyNodeDef, InputSpec } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef, InputSpec } from '@comfyorg/object-info-parser' import { app } from '@/scripts/app' import { CONFIG, GET_CONFIG } from '@comfyorg/graph-model/widgets' import { useLinkStore } from '@/stores/linkStore' diff --git a/src/extensions/core/widgetInputs.ts b/src/extensions/core/widgetInputs.ts index b5d32d5cf71..1e0225f61d7 100644 --- a/src/extensions/core/widgetInputs.ts +++ b/src/extensions/core/widgetInputs.ts @@ -18,8 +18,8 @@ import { createAssetWidget } from '@/platform/assets/utils/createAssetWidget' import { getComboSpecComboOptions, isComboInputSpec -} from '@/schemas/nodeDefSchema' -import type { ComfyNodeDef, InputSpec } from '@/schemas/nodeDefSchema' +} from '@comfyorg/object-info-parser' +import type { ComfyNodeDef, InputSpec } from '@comfyorg/object-info-parser' import { app } from '@/scripts/app' import { useWidgetValueStore } from '@/stores/widgetValueStore' import type { WidgetValue } from '@/types/simplifiedWidget' diff --git a/src/lib/litegraph/src/types/nodeConstructor.ts b/src/lib/litegraph/src/types/nodeConstructor.ts index f16cd94a8cc..a6747596940 100644 --- a/src/lib/litegraph/src/types/nodeConstructor.ts +++ b/src/lib/litegraph/src/types/nodeConstructor.ts @@ -1,4 +1,4 @@ -import type { ComfyNodeDef as ComfyNodeDefV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { ComfyNodeDef as ComfyNodeDefV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import type { LGraphNode } from '@comfyorg/graph-model/entityRegistry' diff --git a/src/platform/customNodes/lateLoading/lateLoading.test.ts b/src/platform/customNodes/lateLoading/lateLoading.test.ts index 1d7d851c25f..f21f462d8ec 100644 --- a/src/platform/customNodes/lateLoading/lateLoading.test.ts +++ b/src/platform/customNodes/lateLoading/lateLoading.test.ts @@ -12,7 +12,7 @@ import { WorkspaceApiError } from '@/platform/remote/ingest/ingestApiError' import { workspaceApi } from '@/platform/workspace/api/workspaceApi' import { useDeploymentPickStore } from '@/platform/workspace/stores/deploymentPickStore' import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { api } from '@/scripts/api' import { app } from '@/scripts/app' import { loadExtensions } from '@/platform/extensions/services/extensionLoader' diff --git a/src/platform/customNodes/manager/utils/mapperUtil.ts b/src/platform/customNodes/manager/utils/mapperUtil.ts index 4c9b3ce4041..98a7d0cf2ec 100644 --- a/src/platform/customNodes/manager/utils/mapperUtil.ts +++ b/src/platform/customNodes/manager/utils/mapperUtil.ts @@ -1,9 +1,9 @@ -import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration' +import { transformInputSpecV1ToV2 } from '@comfyorg/object-info-parser/migration' import type { ComfyNodeDef as ComfyNodeDefV2, InputSpec -} from '@/schemas/nodeDef/nodeDefSchemaV2' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +} from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import type { components } from '@/types/comfyRegistryTypes' const registryToFrontendV2NodeOutputs = ( diff --git a/src/platform/customNodes/useReconnectNodeDefinitionRefresh.test.ts b/src/platform/customNodes/useReconnectNodeDefinitionRefresh.test.ts index aadffbdfafc..4ea223b1887 100644 --- a/src/platform/customNodes/useReconnectNodeDefinitionRefresh.test.ts +++ b/src/platform/customNodes/useReconnectNodeDefinitionRefresh.test.ts @@ -11,7 +11,7 @@ import { import { reportError } from '@comfyorg/telemetry/reportError' import { useWorkflowService } from '@/platform/workflow/core/services/workflowService' import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { api } from '@/scripts/api' import { app } from '@/scripts/app' import { useCommandStore } from '@/platform/keybindings/commandStore' diff --git a/src/platform/workflow/core/utils/restoreDynamicGroupInputs.ts b/src/platform/workflow/core/utils/restoreDynamicGroupInputs.ts index 530e8fe238d..23bcf05d624 100644 --- a/src/platform/workflow/core/utils/restoreDynamicGroupInputs.ts +++ b/src/platform/workflow/core/utils/restoreDynamicGroupInputs.ts @@ -1,11 +1,11 @@ import type { IBaseWidget } from '@comfyorg/graph-model/widgets' import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode' import type { ComfyApiWorkflow } from '@comfyorg/graph-model/workflowSchema' -import type { ComfyInputsSpec } from '@/schemas/nodeDefSchema' +import type { ComfyInputsSpec } from '@comfyorg/object-info-parser' import { zDynamicComboInputSpec, zDynamicGroupInputSpec -} from '@/schemas/nodeDefSchema' +} from '@comfyorg/object-info-parser' import { useNodeDefStore } from '@/stores/nodeDefStore' export function restoreDynamicGroupInputs( diff --git a/src/platform/workflowErrors/missingMedia/__fixtures__/promotedMedia.ts b/src/platform/workflowErrors/missingMedia/__fixtures__/promotedMedia.ts index a104da526d0..0bb250e89ac 100644 --- a/src/platform/workflowErrors/missingMedia/__fixtures__/promotedMedia.ts +++ b/src/platform/workflowErrors/missingMedia/__fixtures__/promotedMedia.ts @@ -12,7 +12,7 @@ import { } from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers' import * as missingMediaScan from '@/platform/workflowErrors/missingMedia/missingMediaScan' import type { MissingMediaCandidate } from '@/platform/workflowErrors/missingMedia/types' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import { useNodeDefStore } from '@/stores/nodeDefStore' import { createNodeExecutionId } from '@comfyorg/graph-model/nodeIdentification' import { toNodeId } from '@comfyorg/graph-model/nodeId' diff --git a/src/platform/workflowErrors/missingMedia/missingMediaScan.ts b/src/platform/workflowErrors/missingMedia/missingMediaScan.ts index 75d0edda6fa..810fdae9bfb 100644 --- a/src/platform/workflowErrors/missingMedia/missingMediaScan.ts +++ b/src/platform/workflowErrors/missingMedia/missingMediaScan.ts @@ -8,8 +8,8 @@ import { } from '@/core/graph/subgraph/resolveConcretePromotedWidget' import { resolvePromotedWidgetSource } from '@/core/graph/subgraph/resolvePromotedWidgetSource' import { resolveWidgetValueAsset } from '@/platform/assets/utils/resolveWidgetValueAsset' -import { isComboInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' -import type { InputSpec as InputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' +import { isComboInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' +import type { InputSpec as InputSpecV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import { useNodeDefStore } from '@/stores/nodeDefStore' import type { MissingMediaCandidate, diff --git a/src/platform/workflowErrors/missingModel/releaseModelOptions.ts b/src/platform/workflowErrors/missingModel/releaseModelOptions.ts index 327f7bab6e9..a6818dd3ff4 100644 --- a/src/platform/workflowErrors/missingModel/releaseModelOptions.ts +++ b/src/platform/workflowErrors/missingModel/releaseModelOptions.ts @@ -3,7 +3,7 @@ import type { ReleaseModelOptions } from '@/platform/workflowErrors/missingModel import { DEPLOYMENT_LISTING_BACKSTOP_MS } from '@/platform/workspace/api/deploymentListingTimeouts' import { couldBootOnDeployment } from '@/platform/workspace/composables/waitForDeploymentPick' import { useDeploymentPickStore } from '@/platform/workspace/stores/deploymentPickStore' -import { isComboInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import { isComboInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import { useNodeDefStore } from '@/stores/nodeDefStore' /** diff --git a/src/renderer/extensions/vueNodes/components/InputSlot.test.ts b/src/renderer/extensions/vueNodes/components/InputSlot.test.ts index 3ae6aa5aed1..384da872a42 100644 --- a/src/renderer/extensions/vueNodes/components/InputSlot.test.ts +++ b/src/renderer/extensions/vueNodes/components/InputSlot.test.ts @@ -9,7 +9,7 @@ import { i18n } from '@/i18n' import type { INodeSlot } from '@/lib/litegraph/src/litegraph' import { useSettingStore } from '@/platform/settings/settingStore' import type { Settings } from '@comfyorg/settings-core/types' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { useNodeDefStore } from '@/stores/nodeDefStore' import InputSlot from './InputSlot.vue' diff --git a/src/renderer/extensions/vueNodes/components/LGraphNodePreview.test.ts b/src/renderer/extensions/vueNodes/components/LGraphNodePreview.test.ts index c60c662658f..a147dc2cd12 100644 --- a/src/renderer/extensions/vueNodes/components/LGraphNodePreview.test.ts +++ b/src/renderer/extensions/vueNodes/components/LGraphNodePreview.test.ts @@ -6,7 +6,7 @@ import { computed } from 'vue' import { beforeEach, describe, expect, it, vi } from 'vitest' import type { WidgetGridItem } from '@/renderer/extensions/vueNodes/types/widgetGrid' -import type { ComfyNodeDef as ComfyNodeDefV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { ComfyNodeDef as ComfyNodeDefV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import LGraphNodePreview from '@/renderer/extensions/vueNodes/components/LGraphNodePreview.vue' import { fromPartial } from '@total-typescript/shoehorn' import type { WidgetValueBinding } from '@/utils/widgetBinding' diff --git a/src/renderer/extensions/vueNodes/components/LGraphNodePreview.vue b/src/renderer/extensions/vueNodes/components/LGraphNodePreview.vue index c456908c3b7..b55c80c3b7e 100644 --- a/src/renderer/extensions/vueNodes/components/LGraphNodePreview.vue +++ b/src/renderer/extensions/vueNodes/components/LGraphNodePreview.vue @@ -45,8 +45,8 @@ import WidgetGrid from '@/renderer/extensions/vueNodes/components/WidgetGrid.vue import type { WidgetGridItem } from '@/renderer/extensions/vueNodes/types/widgetGrid' import WidgetLegacy from '@/renderer/extensions/vueNodes/widgets/components/WidgetLegacy.vue' import { getComponent } from '@/renderer/extensions/vueNodes/widgets/registry/widgetRegistry' -import { dynamicComboOptionKeys } from '@/schemas/nodeDef/inputSpecTree' -import type { ComfyNodeDef as ComfyNodeDefV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' +import { dynamicComboOptionKeys } from '@/core/graph/nodeDef/inputSpecInterpreter' +import type { ComfyNodeDef as ComfyNodeDefV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import { useWidgetStore } from '@/stores/widgetStore' import { toNodeId } from '@comfyorg/graph-model/nodeId' import type { NodeState } from '@comfyorg/graph-model/nodeState' diff --git a/src/renderer/extensions/vueNodes/components/NodeHeader.test.ts b/src/renderer/extensions/vueNodes/components/NodeHeader.test.ts index 7b846768ca5..a7d8be9445e 100644 --- a/src/renderer/extensions/vueNodes/components/NodeHeader.test.ts +++ b/src/renderer/extensions/vueNodes/components/NodeHeader.test.ts @@ -11,7 +11,7 @@ import type { NodeState } from '@comfyorg/graph-model/nodeState' import enMessages from '@/locales/en/main.json' import { useSettingStore } from '@/platform/settings/settingStore' import type { Settings } from '@comfyorg/settings-core/types' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { ComfyNodeDefImpl } from '@/core/graph/nodeDef/ComfyNodeDefImpl' import { useNodeDefStore } from '@/stores/nodeDefStore' diff --git a/src/renderer/extensions/vueNodes/composables/useNodeTooltips.test.ts b/src/renderer/extensions/vueNodes/composables/useNodeTooltips.test.ts index 951fb5b7741..0adefb4fe8b 100644 --- a/src/renderer/extensions/vueNodes/composables/useNodeTooltips.test.ts +++ b/src/renderer/extensions/vueNodes/composables/useNodeTooltips.test.ts @@ -4,7 +4,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { i18n, mergeCustomNodesI18n } from '@/i18n' import { useSettingStore } from '@/platform/settings/settingStore' import type { Settings } from '@comfyorg/settings-core/types' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { useNodeDefStore } from '@/stores/nodeDefStore' import { useNodeTooltips } from './useNodeTooltips' diff --git a/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.test.ts b/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.test.ts index eef55a424b6..d080a10affd 100644 --- a/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.test.ts +++ b/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.test.ts @@ -7,7 +7,7 @@ import { LGraphBadge, LGraphNode } from '@/lib/litegraph/src/litegraph' import type { LGraph } from '@/lib/litegraph/src/litegraph' import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import { usePartitionedBadges } from '@/renderer/extensions/vueNodes/composables/usePartitionedBadges' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { useNodeDefStore } from '@/stores/nodeDefStore' import type { NodeId } from '@comfyorg/graph-model/nodeId' import { toNodeId } from '@comfyorg/graph-model/nodeId' diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetChart.types.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetChart.types.ts index 51c7cf32b59..2cf92595fbd 100644 --- a/src/renderer/extensions/vueNodes/widgets/components/WidgetChart.types.ts +++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetChart.types.ts @@ -1,5 +1,5 @@ import type { IWidgetOptions } from '@comfyorg/graph-model/widgets' -import type { ChartInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { ChartInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' export type ChartWidgetOptions = IWidgetOptions & { type?: ChartInputSpec['chartType'] diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelect.test.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelect.test.ts index 1956fe3e2d4..4357d28b9f2 100644 --- a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelect.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelect.test.ts @@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { defineComponent } from 'vue' import { createI18n } from 'vue-i18n' -import type { ComboInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { ComboInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { SimplifiedWidget } from '@/types/simplifiedWidget' import WidgetSelect from '@/renderer/extensions/vueNodes/widgets/components/WidgetSelect.vue' import { createMockWidget } from './widgetTestUtils' diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelect.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelect.vue index 05db2780197..9b590a4197d 100644 --- a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelect.vue +++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelect.vue @@ -29,8 +29,8 @@ import WidgetSelectDropdown from '@/renderer/extensions/vueNodes/widgets/compone import WidgetWithControl from '@/renderer/extensions/vueNodes/widgets/components/WidgetWithControl.vue' import type { LayoutMode } from '@/renderer/extensions/vueNodes/widgets/components/form/dropdown/types' import type { ResultItemType } from '@comfyorg/api-client/resultItemTypeSchema' -import { isComboInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' -import type { ComboInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import { isComboInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' +import type { ComboInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { SimplifiedControlWidget, SimplifiedWidget, diff --git a/src/renderer/extensions/vueNodes/widgets/composables/richWidgetPanelVisibility.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/richWidgetPanelVisibility.test.ts index f434b33fff0..85d4d739745 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/richWidgetPanelVisibility.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/richWidgetPanelVisibility.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from 'vitest' import { LGraphNode } from '@/lib/litegraph/src/litegraph' -import type { InputSpec as InputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec as InputSpecV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' import { deriveWidgetVisibility, diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useBooleanWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useBooleanWidget.ts index dd455d79731..8113da1795d 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useBooleanWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useBooleanWidget.ts @@ -1,6 +1,6 @@ import type { LGraphNode } from '@/lib/litegraph/src/litegraph' -import { isBooleanInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import { isBooleanInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' export const useBooleanWidget = () => { diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useBoundingBoxWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useBoundingBoxWidget.ts index a0b6378d6e7..a85dd963a6b 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useBoundingBoxWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useBoundingBoxWidget.ts @@ -9,7 +9,7 @@ import type { Bounds } from '@comfyorg/shared-frontend-utils/geometry' import type { BoundingBoxInputSpec, InputSpec as InputSpecV2 -} from '@/schemas/nodeDef/nodeDefSchemaV2' +} from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' function isBoundingBoxLikeWidget( diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useBoundingBoxesWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useBoundingBoxesWidget.ts index 0aefcf392d1..6d547518944 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useBoundingBoxesWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useBoundingBoxesWidget.ts @@ -3,7 +3,7 @@ import type { IBaseWidget } from '@comfyorg/graph-model/widgets' import type { BoundingBoxesInputSpec, InputSpec as InputSpecV2 -} from '@/schemas/nodeDef/nodeDefSchemaV2' +} from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' import type { BoundingBox } from '@comfyorg/graph-model/boundingBoxes' diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useChartWidget.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useChartWidget.test.ts index b62ba974f8a..68eba7ec9ca 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useChartWidget.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useChartWidget.test.ts @@ -6,7 +6,7 @@ import { useChartWidget } from '@/renderer/extensions/vueNodes/widgets/composabl import type { ChartInputSpec, InputSpec -} from '@/schemas/nodeDef/nodeDefSchemaV2' +} from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' function createMockNode(): { node: LGraphNode diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useChartWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useChartWidget.ts index 3cc00eb2349..4b8ba4ec72c 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useChartWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useChartWidget.ts @@ -1,7 +1,7 @@ import type { LGraphNode } from '@/lib/litegraph/src/litegraph' import type { IChartWidget } from '@comfyorg/graph-model/widgets' -import { isChartInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' -import type { InputSpec as InputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' +import { isChartInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' +import type { InputSpec as InputSpecV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' export const useChartWidget = (): ComfyWidgetConstructorV2 => { diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useColorWidget.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useColorWidget.test.ts index e766ae8bd58..bb56a10d39d 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useColorWidget.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useColorWidget.test.ts @@ -3,7 +3,7 @@ import { describe, expect, it, vi } from 'vitest' import { LGraphNode } from '@/lib/litegraph/src/litegraph' import type { IBaseWidget } from '@comfyorg/graph-model/widgets' import { useColorWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useColorWidget' -import type { ColorInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { ColorInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' const DECLARED_DEFAULT = '#00ff00' const BLACK_FALLBACK = '#000000' diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useColorWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useColorWidget.ts index 8da991ddc8b..5ae0cb7dd4a 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useColorWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useColorWidget.ts @@ -1,10 +1,10 @@ import type { LGraphNode } from '@/lib/litegraph/src/litegraph' import type { IColorWidget } from '@comfyorg/graph-model/widgets' -import { isColorInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import { isColorInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ColorInputSpec, InputSpec as InputSpecV2 -} from '@/schemas/nodeDef/nodeDefSchemaV2' +} from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' export const useColorWidget = (): ComfyWidgetConstructorV2 => { diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useColorsWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useColorsWidget.ts index f981aa0cbc7..3b0c571692e 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useColorsWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useColorsWidget.ts @@ -3,7 +3,7 @@ import type { IBaseWidget } from '@comfyorg/graph-model/widgets' import type { ColorsInputSpec, InputSpec as InputSpecV2 -} from '@/schemas/nodeDef/nodeDefSchemaV2' +} from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' export const useColorsWidget = (): ComfyWidgetConstructorV2 => { diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useComboWidget.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useComboWidget.test.ts index 58ae90a2d77..c1a50b289ab 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useComboWidget.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useComboWidget.test.ts @@ -18,7 +18,7 @@ import { } from '@/platform/workflowErrors/missingModel/missingModelScan' import { t } from '@/i18n' import { useComboWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useComboWidget' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import { addValueControlWidgets } from '@/core/graph/widgets/valueControlWidgets' function createMockAssetItem(overrides: Partial = {}): AssetItem { diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useComboWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useComboWidget.ts index 6d95ef71bb4..f0d02b01948 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useComboWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useComboWidget.ts @@ -16,9 +16,9 @@ import { useDeploymentLibraryModelsStore } from '@/platform/workspace/stores/dep import type { ComboInputSpec, InputSpec -} from '@/schemas/nodeDef/nodeDefSchemaV2' -import { isComboInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' -import { transformInputSpecV2ToV1 } from '@/schemas/nodeDef/migration' +} from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' +import { isComboInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' +import { transformInputSpecV2ToV1 } from '@comfyorg/object-info-parser/migration' import { ComponentWidgetImpl, addWidget } from '@/scripts/domWidget' import type { BaseDOMWidget } from '@/types/domWidget' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useCompositorWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useCompositorWidget.ts index 16eaf5c2692..21e451b213c 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useCompositorWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useCompositorWidget.ts @@ -4,7 +4,7 @@ import { } from '@/renderer/extensions/compositor/components/types' import type { LGraphNode } from '@/lib/litegraph/src/litegraph' import type { ICompositorWidget } from '@comfyorg/graph-model/widgets' -import type { InputSpec as InputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec as InputSpecV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' export const useCompositorWidget = (): ComfyWidgetConstructorV2 => { diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useCurveWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useCurveWidget.ts index 17a34a454f3..07c61907b9f 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useCurveWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useCurveWidget.ts @@ -4,7 +4,7 @@ import type { ICurveWidget } from '@comfyorg/graph-model/widgets' import type { CurveInputSpec, InputSpec as InputSpecV2 -} from '@/schemas/nodeDef/nodeDefSchemaV2' +} from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' const DEFAULT_CURVE_DATA: CurveData = { diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useFloatWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useFloatWidget.ts index c7b6ce39888..c2dfb192108 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useFloatWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useFloatWidget.ts @@ -3,11 +3,11 @@ import { clamp } from 'es-toolkit/compat' import type { LGraphNode } from '@/lib/litegraph/src/litegraph' import type { INumericWidget } from '@comfyorg/graph-model/widgets' import { useSettingStore } from '@/platform/settings/settingStore' -import { isFloatInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import { isFloatInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' import { addValueControlWidget } from '@/core/graph/widgets/valueControlWidgets' -import { transformInputSpecV2ToV1 } from '@/schemas/nodeDef/migration' +import { transformInputSpecV2ToV1 } from '@comfyorg/object-info-parser/migration' function onFloatValueChange(this: INumericWidget, v: number) { const round = this.options.round diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useGalleriaWidget.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useGalleriaWidget.test.ts index 7056c40336e..726f678826a 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useGalleriaWidget.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useGalleriaWidget.test.ts @@ -3,7 +3,7 @@ import { describe, expect, it, vi } from 'vitest' import { LGraphNode } from '@/lib/litegraph/src/litegraph' import type { IBaseWidget } from '@comfyorg/graph-model/widgets' import { useGalleriaWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useGalleriaWidget' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' function createMockNode(): { node: LGraphNode diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useGalleriaWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useGalleriaWidget.ts index 3c67f759041..3e996802de0 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useGalleriaWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useGalleriaWidget.ts @@ -1,10 +1,10 @@ import type { LGraphNode } from '@/lib/litegraph/src/litegraph' import type { IGalleriaWidget } from '@comfyorg/graph-model/widgets' -import { isGalleriaInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import { isGalleriaInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { GalleriaInputSpec, InputSpec as InputSpecV2 -} from '@/schemas/nodeDef/nodeDefSchemaV2' +} from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' export const useGalleriaWidget = (): ComfyWidgetConstructorV2 => { diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useImageCompareWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useImageCompareWidget.ts index ba14994c478..d2f359a2021 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useImageCompareWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useImageCompareWidget.ts @@ -3,7 +3,7 @@ import type { IImageCompareWidget } from '@comfyorg/graph-model/widgets' import type { ImageCompareInputSpec, InputSpec as InputSpecV2 -} from '@/schemas/nodeDef/nodeDefSchemaV2' +} from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' export const useImageCompareWidget = (): ComfyWidgetConstructorV2 => { diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useImagePreviewWidget.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useImagePreviewWidget.test.ts index 3665fbc8f74..9623914f647 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useImagePreviewWidget.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useImagePreviewWidget.test.ts @@ -6,7 +6,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { LiteGraph } from '@/lib/litegraph/src/litegraph' import type { CanvasPointer, LGraphNode } from '@/lib/litegraph/src/litegraph' import type { BaseWidget } from '@/lib/litegraph/src/widgets/BaseWidget' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' const mockCanvas = vi.hoisted(() => ({ graph_mouse: [0, 0] as [number, number], diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useImagePreviewWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useImagePreviewWidget.ts index d4198df7501..53296a9c0c8 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useImagePreviewWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useImagePreviewWidget.ts @@ -4,7 +4,7 @@ import type { IBaseWidget, IWidgetOptions } from '@comfyorg/graph-model/widgets' import type { DrawWidgetOptions } from '@/lib/litegraph/src/widgets/BaseWidget' import { useSettingStore } from '@/platform/settings/settingStore' import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import { useApp } from '@/scripts/appInstance' import { calculateImageGrid } from '@/scripts/ui/imagePreview' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useImageUploadWidget.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useImageUploadWidget.test.ts index ab9e5b88a33..a4363fe4889 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useImageUploadWidget.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useImageUploadWidget.test.ts @@ -8,7 +8,7 @@ import { LGraphNode } from '@/lib/litegraph/src/litegraph' import type { IComboWidget } from '@comfyorg/graph-model/widgets' import type { ResultItem } from '@comfyorg/api-client/executionTypes' import { useToast } from '@/components/ui/toast/toastStore' -import type { InputSpec } from '@/schemas/nodeDefSchema' +import type { InputSpec } from '@comfyorg/object-info-parser' import type { useNodeImageUpload } from '@/composables/node/useNodeImageUpload' type CapturedImageUploadOptions = Parameters[1] diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useImageUploadWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useImageUploadWidget.ts index 7c3ffb5bc73..34c9843ded6 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useImageUploadWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useImageUploadWidget.ts @@ -5,7 +5,7 @@ import type { LGraphNode } from '@/lib/litegraph/src/litegraph' import type { IComboWidget } from '@comfyorg/graph-model/widgets' import type { ResultItem } from '@comfyorg/api-client/executionTypes' import type { ResultItemType } from '@comfyorg/api-client/resultItemTypeSchema' -import type { InputSpec } from '@/schemas/nodeDefSchema' +import type { InputSpec } from '@comfyorg/object-info-parser' import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore' import { useToast } from '@/components/ui/toast/toastStore' import type { ComfyWidgetConstructor } from '@/types/comfy' diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useIntWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useIntWidget.ts index f02ac69927d..f08808c62d2 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useIntWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useIntWidget.ts @@ -4,11 +4,11 @@ import type { INumericWidget } from '@comfyorg/graph-model/widgets' import { useSettingStore } from '@/platform/settings/settingStore' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' -import { isIntInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' +import { isIntInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' import { addValueControlWidget } from '@/core/graph/widgets/valueControlWidgets' -import { transformInputSpecV2ToV1 } from '@/schemas/nodeDef/migration' +import { transformInputSpecV2ToV1 } from '@comfyorg/object-info-parser/migration' function onValueChange(this: INumericWidget, v: number) { // For integers, always round to the nearest step diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useLightInfoWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useLightInfoWidget.ts index 248cfdce633..e7ac7993f25 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useLightInfoWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useLightInfoWidget.ts @@ -1,7 +1,7 @@ import { normalizeLightsValue } from '@comfyorg/viewport3d/lightInfo/lightsValue' import type { LGraphNode } from '@/lib/litegraph/src/litegraph' import type { IBaseWidget } from '@comfyorg/graph-model/widgets' -import type { InputSpec as InputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec as InputSpecV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' export const useLightInfoWidget = (): ComfyWidgetConstructorV2 => { diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useMarkdownWidget.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useMarkdownWidget.test.ts index c4d6a50a4c5..38ae46eaa0d 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useMarkdownWidget.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useMarkdownWidget.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it, onTestFinished, vi } from 'vitest' import type { LGraphNode } from '@/lib/litegraph/src/litegraph' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { DOMWidget } from '@/types/domWidget' import { useMarkdownWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useMarkdownWidget' import { createMockDOMWidgetNode } from '@/renderer/extensions/vueNodes/widgets/composables/domWidgetTestUtils' diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useMarkdownWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useMarkdownWidget.ts index c519cb3a998..58b3a1e6f4c 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useMarkdownWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useMarkdownWidget.ts @@ -5,7 +5,7 @@ import type { LGraphNode } from '@/lib/litegraph/src/litegraph' import { resolveNodeRootGraphId } from '@/lib/litegraph/src/utils/widget' import { reportError } from '@comfyorg/telemetry/reportError' import { forwardMiddleButtonToCanvas } from '@/renderer/extensions/vueNodes/widgets/utils/forwardMiddleButtonToCanvas' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import { useApp } from '@/scripts/appInstance' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' import { useWidgetValueStore } from '@/stores/widgetValueStore' diff --git a/src/renderer/extensions/vueNodes/widgets/composables/usePainterWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/usePainterWidget.ts index bf26be18785..ec28dbb7942 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/usePainterWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/usePainterWidget.ts @@ -1,6 +1,6 @@ import type { LGraphNode } from '@/lib/litegraph/src/litegraph' import type { IBaseWidget } from '@comfyorg/graph-model/widgets' -import type { InputSpec as InputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec as InputSpecV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' export const usePainterWidget = (): ComfyWidgetConstructorV2 => { diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useProgressTextWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useProgressTextWidget.ts index be877d6d0c6..f129829bc72 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useProgressTextWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useProgressTextWidget.ts @@ -1,7 +1,7 @@ import TextPreviewWidget from '@/components/graph/widgets/TextPreviewWidget.vue' import { resolveNodeRootGraphId } from '@/lib/litegraph/src/litegraph' import type { LGraphNode } from '@/lib/litegraph/src/litegraph' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import { ComponentWidgetImpl, addWidget } from '@/scripts/domWidget' import type { ComponentWidgetStandardProps } from '@/types/domWidget' import { useApp } from '@/scripts/appInstance' diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useRangeWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useRangeWidget.ts index 2c8c1cc8ab8..f6e787f162b 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useRangeWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useRangeWidget.ts @@ -3,7 +3,7 @@ import type { IRangeWidget, IWidgetRangeOptions } from '@comfyorg/graph-model/widgets' -import type { RangeInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { RangeInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' export const useRangeWidget = (): ComfyWidgetConstructorV2 => { diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.test.ts index 0fb0658b163..aa0bb3f6c0a 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.test.ts @@ -18,7 +18,7 @@ import type { import { provideWebSessionRequests } from '@comfyorg/api-client/webSessionFetch' import { api } from '@/scripts/api' import { useRemoteWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget' -import type { RemoteWidgetConfig } from '@/schemas/nodeDefSchema' +import type { RemoteWidgetConfig } from '@comfyorg/object-info-parser' import { createMockLGraphNode } from '@/utils/__tests__/litegraphTestUtils' import { stubFirebaseAuthHarness } from '@/utils/__tests__/stubAccountIdentityPort' import { useAuthStore } from '@/stores/authStore' diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.ts index dc86ab71277..691e3804993 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.ts @@ -6,7 +6,7 @@ import { useChainCallback } from '@/composables/functional/useChainCallback' import type { ComboWidgetInventoryStatus } from '@/core/graph/widgets/comboWidgetInventory' import type { IWidget, LGraphNode } from '@/lib/litegraph/src/litegraph' import { isCloud } from '@/platform/distribution/types' -import type { RemoteWidgetConfig } from '@/schemas/nodeDefSchema' +import type { RemoteWidgetConfig } from '@comfyorg/object-info-parser' import { api } from '@/scripts/api' import { useAuthStore } from '@/stores/authStore' diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useResolutionPreviewWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useResolutionPreviewWidget.ts index dca2a3d47d1..013e2e16be8 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useResolutionPreviewWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useResolutionPreviewWidget.ts @@ -3,8 +3,8 @@ import type { IResolutionPreviewWidget, IWidgetResolutionPreviewOptions } from '@comfyorg/graph-model/widgets' -import { isResolutionPreviewInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' -import type { InputSpec as InputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' +import { isResolutionPreviewInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' +import type { InputSpec as InputSpecV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' export const useResolutionPreviewWidget = (): ComfyWidgetConstructorV2 => { diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useStringWidget.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useStringWidget.test.ts index caedbf12062..ea863a5489e 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useStringWidget.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useStringWidget.test.ts @@ -6,7 +6,7 @@ import { describe, expect, it, onTestFinished, vi } from 'vitest' import { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph' // Installs `addDOMWidget` on the LGraphNode prototype for the real-graph cases. import '@/scripts/domWidget' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { DOMWidget } from '@/types/domWidget' import { useStringWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useStringWidget' import { createMockDOMWidgetNode } from '@/renderer/extensions/vueNodes/widgets/composables/domWidgetTestUtils' diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useStringWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useStringWidget.ts index ac68e49eea5..182e58227df 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useStringWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useStringWidget.ts @@ -6,8 +6,8 @@ import { bindMultilineTextareaWidget, createMultilineInputElement } from '@/renderer/extensions/vueNodes/widgets/utils/multilineTextarea' -import { isStringInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import { isStringInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import { useApp } from '@/scripts/appInstance' import { isDOMWidget } from '@/scripts/domWidget' import type { DOMWidgetOptions } from '@/types/domWidget' diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useTextareaWidget.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useTextareaWidget.test.ts index 466cb4e6949..dcf746a07f2 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useTextareaWidget.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useTextareaWidget.test.ts @@ -3,7 +3,7 @@ import { describe, expect, it, vi } from 'vitest' import { LGraphNode } from '@/lib/litegraph/src/litegraph' import type { IBaseWidget } from '@comfyorg/graph-model/widgets' import { useTextareaWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useTextareaWidget' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' function createMockNode(): { node: LGraphNode diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useTextareaWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useTextareaWidget.ts index 0404a8f02df..7179bdbd56e 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useTextareaWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useTextareaWidget.ts @@ -1,10 +1,10 @@ import type { LGraphNode } from '@/lib/litegraph/src/litegraph' import type { ITextareaWidget } from '@comfyorg/graph-model/widgets' -import { isTextareaInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import { isTextareaInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { InputSpec as InputSpecV2, TextareaInputSpec -} from '@/schemas/nodeDef/nodeDefSchemaV2' +} from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' export const useTextareaWidget = (): ComfyWidgetConstructorV2 => { diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useVideoConcatWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useVideoConcatWidget.ts index 152e3e58ae5..63c42bf572e 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useVideoConcatWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useVideoConcatWidget.ts @@ -4,8 +4,8 @@ import type { IVideoConcatWidget, IWidgetVideoConcatOptions } from '@comfyorg/graph-model/widgets' -import { isVideoConcatInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' -import type { InputSpec as InputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' +import { isVideoConcatInputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' +import type { InputSpec as InputSpecV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' export const useVideoConcatWidget = (): ComfyWidgetConstructorV2 => { diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useVideoEditWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useVideoEditWidget.ts index a74d52b3402..578ee7dcf55 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useVideoEditWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useVideoEditWidget.ts @@ -7,7 +7,7 @@ import type { import type { InputSpec as InputSpecV2, VideoEditInputSpec -} from '@/schemas/nodeDef/nodeDefSchemaV2' +} from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' export const useVideoEditWidget = (): ComfyWidgetConstructorV2 => { diff --git a/src/renderer/glsl/glslPreviewStoreContract.test.ts b/src/renderer/glsl/glslPreviewStoreContract.test.ts index 4b50713edb4..c9c1f1ca64b 100644 --- a/src/renderer/glsl/glslPreviewStoreContract.test.ts +++ b/src/renderer/glsl/glslPreviewStoreContract.test.ts @@ -10,7 +10,7 @@ import { useStringWidget } from '@/renderer/extensions/vueNodes/widgets/composab import { DEBOUNCE_MS } from '@/renderer/glsl/glslPreviewUtils' import { useGLSLPreview } from '@/renderer/glsl/useGLSLPreview' import type { GLSLRendererConfig } from '@/renderer/glsl/useGLSLRenderer' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import { createNodeLocatorId } from '@comfyorg/graph-model/nodeIdentification' /** diff --git a/src/schemas/nodeDef/inputSpecUtil.ts b/src/schemas/nodeDef/inputSpecUtil.ts deleted file mode 100644 index bacafa1b414..00000000000 --- a/src/schemas/nodeDef/inputSpecUtil.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { inputSpecTree } from '@/schemas/nodeDef/inputSpecTree' -import type { InputSpec as InputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' - -/** - * Returns the node's top-level input specs plus every input nested inside a - * dynamic control, deduped by name (first occurrence wins). - * - * Intentionally includes all DynamicCombo options' inputs as a flat union -- - * the Info tab is reference documentation, not live widget state tied to the - * currently-selected option. - * - * @param inputs The node's top-level input specs - * @returns Flattened input specs including nested dynamic control inputs - */ -export function flattenInputSpecs( - inputs: Record -): InputSpecV2[] { - const seenNames = new Set() - const result: InputSpecV2[] = [] - - for (const spec of Object.values(inputs)) { - for (const nested of inputSpecTree(spec)) { - if (seenNames.has(nested.name)) continue - seenNames.add(nested.name) - result.push(nested) - } - } - - return result -} diff --git a/src/schemas/nodeDef/searchableSlotTypes.ts b/src/schemas/nodeDef/searchableSlotTypes.ts deleted file mode 100644 index 3000ceb9ab0..00000000000 --- a/src/schemas/nodeDef/searchableSlotTypes.ts +++ /dev/null @@ -1,64 +0,0 @@ -import { uniq } from 'es-toolkit/compat' - -import { - inputSpecTree, - matchTypeTemplate, - ownSlotTypes, - splitSlotTypes -} from '@/schemas/nodeDef/inputSpecTree' -import type { - InputSpec as InputSpecV2, - OutputSpec as OutputSpecV2 -} from '@/schemas/nodeDef/nodeDefSchemaV2' - -/** - * Every slot type an input could expose, including types nested inside - * dynamic controls. - * - * The result is a union of possibilities across DynamicCombo options, which - * are mutually exclusive at runtime -- a node instance exposes the sockets of - * one selected option, not all of them. Use this for search and discovery - * only; to ask what a live node accepts, inspect `node.inputs`. - */ -export function collectSearchableInputTypes(input: InputSpecV2): string[] { - return inputSpecTree(input).flatMap(ownSlotTypes) -} - -/** - * Every slot type an output could produce. - * - * A MatchType output has no concrete type of its own: it resolves at runtime - * to whatever its template group's connected inputs agree on. Its allowed - * types stand in for that, so the node is findable by what it can produce - * rather than by the literal COMFY_MATCHTYPE_V3 placeholder. - */ -export function collectSearchableOutputTypes( - outputs: OutputSpecV2[], - inputs: Record, - outputMatchTypes: (string | undefined)[] | undefined -): string[] { - if (!outputs.some((output) => output.type === 'COMFY_MATCHTYPE_V3')) { - return outputs.flatMap((output) => splitSlotTypes(output.type)) - } - - const allowedTypesByTemplate = new Map() - for (const input of Object.values(inputs)) { - for (const spec of inputSpecTree(input)) { - const template = matchTypeTemplate(spec) - if (!template) continue - - const seen = allowedTypesByTemplate.get(template.templateId) ?? [] - allowedTypesByTemplate.set( - template.templateId, - uniq([...seen, ...template.allowedTypes]) - ) - } - } - - return outputs.flatMap((output) => { - if (output.type !== 'COMFY_MATCHTYPE_V3') return splitSlotTypes(output.type) - - const templateId = outputMatchTypes?.[output.index] - return templateId ? (allowedTypesByTemplate.get(templateId) ?? []) : [] - }) -} diff --git a/src/schemas/nodeDefSchema.ts b/src/schemas/nodeDefSchema.ts deleted file mode 100644 index e1040a4fcb0..00000000000 --- a/src/schemas/nodeDefSchema.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@comfyorg/object-info-parser' diff --git a/src/scripts/app.getNodeDefs.test.ts b/src/scripts/app.getNodeDefs.test.ts index fe4dbd89537..30bc9911870 100644 --- a/src/scripts/app.getNodeDefs.test.ts +++ b/src/scripts/app.getNodeDefs.test.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, test, vi } from 'vitest' import { mergeCustomNodesI18n, resolveNodeDefText } from '@/i18n' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import { api } from '@/scripts/api' import { app as comfyApp } from '@/scripts/app' diff --git a/src/scripts/app.test.ts b/src/scripts/app.test.ts index d24f0a40e7a..4241658d044 100644 --- a/src/scripts/app.test.ts +++ b/src/scripts/app.test.ts @@ -26,7 +26,7 @@ import { import { effectScope, markRaw, ref } from 'vue' import { useLitegraphService } from '@/services/litegraphService' import { useNodeDefStore } from '@/stores/nodeDefStore' -import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration' +import { transformInputSpecV1ToV2 } from '@comfyorg/object-info-parser/migration' vi.mock(import('@vueuse/router'), () => ({ useRouteHash: () => ref('') })) @@ -109,7 +109,7 @@ import { useExecutionStore } from '@/stores/executionStore' import { useJobModelDownloadStore } from '@/stores/jobModelDownloadStore' import { useExtensionStore } from '@/platform/extensions/stores/extensionStore' import { useDialogStore } from '@/stores/dialogStore' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { createNodeExecutionId } from '@comfyorg/graph-model/nodeIdentification' import { toNodeId } from '@comfyorg/graph-model/nodeId' import { diff --git a/src/scripts/app.ts b/src/scripts/app.ts index da6eee6df68..e9c832ebf0e 100644 --- a/src/scripts/app.ts +++ b/src/scripts/app.ts @@ -90,8 +90,11 @@ import type { NodeExecutionOutput } from '@comfyorg/api-client/executionTypes' import type { NodeError } from '@comfyorg/api-client/types' -import { isComboInputSpecV1, isComboInputSpecV2 } from '@/schemas/nodeDefSchema' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +import { + isComboInputSpecV1, + isComboInputSpecV2 +} from '@comfyorg/object-info-parser' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import { ComponentWidgetImpl, DOMWidgetImpl } from '@/scripts/domWidget' import type { BaseDOMWidget } from '@/types/domWidget' import { useAccountPreconditionDialog } from '@/platform/billing/subscription/composables/useAccountPreconditionDialog' diff --git a/src/scripts/domWidget.ts b/src/scripts/domWidget.ts index d2244248ce9..5b38a7f9850 100644 --- a/src/scripts/domWidget.ts +++ b/src/scripts/domWidget.ts @@ -10,7 +10,7 @@ import { LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' import { wasWidgetRefused } from '@/lib/litegraph/src/node/widgetsView' import type { IBaseWidget } from '@comfyorg/graph-model/widgets' import { LegacyWidget } from '@/lib/litegraph/src/widgets/LegacyWidget' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import { useDomWidgetStore } from '@/stores/domWidgetStore' import type { BaseDOMWidget, diff --git a/src/scripts/widgets.ts b/src/scripts/widgets.ts index 8cd2e0584c2..456615fc68c 100644 --- a/src/scripts/widgets.ts +++ b/src/scripts/widgets.ts @@ -27,7 +27,7 @@ import { useStringWidget } from '@/renderer/extensions/vueNodes/widgets/composab import { useTextareaWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useTextareaWidget' import { useVideoConcatWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useVideoConcatWidget' import { useVideoEditWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useVideoEditWidget' -import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration' +import { transformInputSpecV1ToV2 } from '@comfyorg/object-info-parser/migration' import type { ComfyWidgetConstructorV2 } from '@/types/widgetConstructor' import type { ComfyWidgetConstructor } from '@/types/comfy' diff --git a/src/services/litegraphService.lateRegistration.test.ts b/src/services/litegraphService.lateRegistration.test.ts index 4c6f1ecca28..515c77a6b55 100644 --- a/src/services/litegraphService.lateRegistration.test.ts +++ b/src/services/litegraphService.lateRegistration.test.ts @@ -8,7 +8,7 @@ import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' import { layoutStore } from '@/renderer/core/layout/store/layoutStore' import type { LayoutOperation } from '@/renderer/core/layout/types' import { installErrorNodeWidgets } from '@/scripts/errorNodeWidgets' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import { useLitegraphService } from '@/services/litegraphService' import { useWidgetValueStore } from '@/stores/widgetValueStore' import { toNodeId } from '@comfyorg/graph-model/nodeId' diff --git a/src/services/litegraphService.test.ts b/src/services/litegraphService.test.ts index 25a52d3f824..5a227bf1901 100644 --- a/src/services/litegraphService.test.ts +++ b/src/services/litegraphService.test.ts @@ -6,7 +6,7 @@ vi.mock(import('@/scripts/app')) import { i18n, mergeCustomNodesI18n } from '@/i18n' import { LiteGraph } from '@/lib/litegraph/src/litegraph' import type { IBaseWidget } from '@comfyorg/graph-model/widgets' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import { app } from '@/scripts/app' import { useLitegraphService } from '@/services/litegraphService' import { useWidgetStore } from '@/stores/widgetStore' diff --git a/src/services/litegraphService.ts b/src/services/litegraphService.ts index 5067e8c2ef6..b22edf3fb4e 100644 --- a/src/services/litegraphService.ts +++ b/src/services/litegraphService.ts @@ -48,20 +48,20 @@ import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import { useDialogService } from '@/services/dialogService' import { resolveSubgraphPseudoWidgetCache } from '@/services/subgraphPseudoWidgetCache' import type { SubgraphPseudoWidgetCache } from '@/services/subgraphPseudoWidgetCache' -import { transformInputSpecV2ToV1 } from '@/schemas/nodeDef/migration' +import { transformInputSpecV2ToV1 } from '@comfyorg/object-info-parser/migration' import type { ComfyNodeDef as ComfyNodeDefV2, InputSpec, OutputSpec -} from '@/schemas/nodeDef/nodeDefSchemaV2' +} from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyNodeDef as ComfyNodeDefV1, InputSpec as InputSpecV1 -} from '@/schemas/nodeDefSchema' +} from '@comfyorg/object-info-parser' import { getInputSpecType, zDynamicGroupInputSpec -} from '@/schemas/nodeDefSchema' +} from '@comfyorg/object-info-parser' import { useApp } from '@/scripts/appInstance' import { provideLitegraphService } from '@/core/graph/litegraphServiceAccess' import { diff --git a/src/services/nodeSearchService.test.ts b/src/services/nodeSearchService.test.ts index 2b4f5c5ea33..0cf194fffac 100644 --- a/src/services/nodeSearchService.test.ts +++ b/src/services/nodeSearchService.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { NodeSearchService } from '@/services/nodeSearchService' import { ComfyNodeDefImpl } from '@/core/graph/nodeDef/ComfyNodeDefImpl' diff --git a/src/services/subgraphService.ts b/src/services/subgraphService.ts index 59b45fa1905..5134b7551b5 100644 --- a/src/services/subgraphService.ts +++ b/src/services/subgraphService.ts @@ -5,7 +5,7 @@ import type { } from '@/lib/litegraph/src/litegraph' import { normalizeSubgraphDefinitionIds } from '@/lib/litegraph/src/subgraph/subgraphDeduplication' import type { ComfyWorkflowJSON } from '@comfyorg/graph-model/workflowSchema' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import { useApp } from '@/scripts/appInstance' import { useNodeDefStore } from '@/stores/nodeDefStore' diff --git a/src/stores/nodeDefStore.nodeText.test.ts b/src/stores/nodeDefStore.nodeText.test.ts index dbf2dbee3eb..94c6d2e0803 100644 --- a/src/stores/nodeDefStore.nodeText.test.ts +++ b/src/stores/nodeDefStore.nodeText.test.ts @@ -2,7 +2,7 @@ import { clone } from 'es-toolkit/compat' import { afterEach, describe, expect, it } from 'vitest' import { mergeCustomNodesI18n, setActiveLocale } from '@/i18n' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import { ComfyNodeDefImpl } from '@/core/graph/nodeDef/ComfyNodeDefImpl' import { useNodeDefStore } from '@/stores/nodeDefStore' diff --git a/src/stores/nodeDefStore.test.ts b/src/stores/nodeDefStore.test.ts index 689abb99b3f..e63abbb4df0 100644 --- a/src/stores/nodeDefStore.test.ts +++ b/src/stores/nodeDefStore.test.ts @@ -8,7 +8,7 @@ import { createTestSubgraph, createTestSubgraphNode } from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { useNodeDefStore } from '@/stores/nodeDefStore' import { useNodeFrequencyStore } from '@/stores/nodeFrequencyStore' import type { NodeDefFilter } from '@/stores/nodeDefStore' diff --git a/src/stores/nodeDefStore.ts b/src/stores/nodeDefStore.ts index 077ce79bad0..0f71af1163e 100644 --- a/src/stores/nodeDefStore.ts +++ b/src/stores/nodeDefStore.ts @@ -8,9 +8,9 @@ import { resolveConcretePromotedWidget } from '@/core/graph/subgraph/resolveConc import { resolveDynamicInputSpec } from '@/core/graph/widgets/dynamicInputSpec' import { LiteGraph } from '@/lib/litegraph/src/litegraph' import type { LGraphNode } from '@/lib/litegraph/src/litegraph' -import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration' -import type { InputSpec as InputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +import { transformInputSpecV1ToV2 } from '@comfyorg/object-info-parser/migration' +import type { InputSpec as InputSpecV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import { useSettingStore } from '@/platform/settings/settingStore' import { NodeSearchService } from '@/services/nodeSearchService' import { useNodeFrequencyStore } from '@/stores/nodeFrequencyStore' diff --git a/src/stores/subgraphStore.test.ts b/src/stores/subgraphStore.test.ts index 58a8664241a..7a98b72412a 100644 --- a/src/stores/subgraphStore.test.ts +++ b/src/stores/subgraphStore.test.ts @@ -11,7 +11,7 @@ import { import { useToast } from '@/components/ui/toast/toastStore' import type { ExportedSubgraph } from '@comfyorg/graph-model/serialisation' import { TemplateIncludeOnDistributionEnum } from '@comfyorg/api-client/templateTypes' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import type { GlobalSubgraphData } from '@comfyorg/api-client/ComfyApi' import { api } from '@/scripts/api' import { app as comfyApp } from '@/scripts/app' diff --git a/src/stores/subgraphStore.ts b/src/stores/subgraphStore.ts index 35ed77734a7..8c89814f489 100644 --- a/src/stores/subgraphStore.ts +++ b/src/stores/subgraphStore.ts @@ -18,7 +18,7 @@ import type { NodeError } from '@comfyorg/api-client/types' import type { ComfyNodeDef as ComfyNodeDefV1, InputSpec -} from '@/schemas/nodeDefSchema' +} from '@comfyorg/object-info-parser' import { isCloud, isDesktop } from '@/platform/distribution/types' import { TemplateIncludeOnDistributionEnum } from '@comfyorg/api-client/templateTypes' import { api } from '@/scripts/api' diff --git a/src/stores/widgetStore.test.ts b/src/stores/widgetStore.test.ts index 747952005a6..ca4f7962082 100644 --- a/src/stores/widgetStore.test.ts +++ b/src/stores/widgetStore.test.ts @@ -13,7 +13,7 @@ vi.mock(import('@/scripts/widgets'), () => ({ } })) -vi.mock(import('@/schemas/nodeDefSchema'), () => ({ +vi.mock(import('@comfyorg/object-info-parser'), () => ({ getInputSpecType: (spec: unknown[]) => spec[0] })) diff --git a/src/stores/widgetStore.ts b/src/stores/widgetStore.ts index 6933643687c..c8926a8dcec 100644 --- a/src/stores/widgetStore.ts +++ b/src/stores/widgetStore.ts @@ -1,9 +1,9 @@ import { defineStore } from 'pinia' import { computed, ref } from 'vue' -import type { InputSpec as InputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' -import { getInputSpecType } from '@/schemas/nodeDefSchema' -import type { InputSpec as InputSpecV1 } from '@/schemas/nodeDefSchema' +import type { InputSpec as InputSpecV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' +import { getInputSpecType } from '@comfyorg/object-info-parser' +import type { InputSpec as InputSpecV1 } from '@comfyorg/object-info-parser' import { ComfyWidgets } from '@/scripts/widgets' import type { ComfyWidgetConstructor, diff --git a/src/types/comfy.ts b/src/types/comfy.ts index 9853c36293e..41e95637f00 100644 --- a/src/types/comfy.ts +++ b/src/types/comfy.ts @@ -30,7 +30,7 @@ import type { ComfyWorkflow, LoadedComfyWorkflow } from '@/platform/workflow/management/stores/comfyWorkflow' -import type { ComfyNodeDef, InputSpec } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef, InputSpec } from '@comfyorg/object-info-parser' import type { ComfyApi } from '@comfyorg/api-client/ComfyApi' import type { ComfyUI } from '@/scripts/ui' import type { ComfyAppMenu } from '@/scripts/ui/menu/index' diff --git a/src/types/domWidget.ts b/src/types/domWidget.ts index f3174c95b28..197ca2af74d 100644 --- a/src/types/domWidget.ts +++ b/src/types/domWidget.ts @@ -2,7 +2,7 @@ import type { Component } from 'vue' import type { LGraphNode } from '@comfyorg/graph-model/entityRegistry' import type { IBaseWidget, IWidgetOptions } from '@comfyorg/graph-model/widgets' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' export interface BaseDOMWidget< V extends object | string = object | string diff --git a/src/types/index.ts b/src/types/index.ts index ba0d62311ab..4a91717893c 100644 --- a/src/types/index.ts +++ b/src/types/index.ts @@ -60,8 +60,8 @@ export type { ComfyExtension } from './comfy' export type { ComfyDesktop2Bridge } from '@comfyorg/comfyui-desktop-bridge-types' export type { ComfyApi } from '@comfyorg/api-client/ComfyApi' export type { ComfyApp } from '@/types/comfy' -export type { ComfyNodeDef } from '@/schemas/nodeDefSchema' -export type { InputSpec } from '@/schemas/nodeDefSchema' +export type { ComfyNodeDef } from '@comfyorg/object-info-parser' +export type { InputSpec } from '@comfyorg/object-info-parser' export type { NodeLocatorId, NodeExecutionId, diff --git a/src/types/nodeDefAugmentation.ts b/src/types/nodeDefAugmentation.ts index 5dad8ee73d9..2a94106c196 100644 --- a/src/types/nodeDefAugmentation.ts +++ b/src/types/nodeDefAugmentation.ts @@ -5,7 +5,7 @@ * types with frontend-specific properties. These augmentations are applied at * runtime and are not part of the backend API contract. */ -import type { ComboInputOptions, InputSpec } from '@/schemas/nodeDefSchema' +import type { ComboInputOptions, InputSpec } from '@comfyorg/object-info-parser' /** * Frontend augmentation for image upload combo inputs. diff --git a/src/types/simplifiedWidget.ts b/src/types/simplifiedWidget.ts index 83260bf11fb..26ef420837d 100644 --- a/src/types/simplifiedWidget.ts +++ b/src/types/simplifiedWidget.ts @@ -2,7 +2,7 @@ * Simplified widget interface for Vue-based node rendering * Removes all DOM manipulation and positioning concerns */ -import type { InputSpec as InputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec as InputSpecV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { IBaseWidget, IWidgetOptions } from '@comfyorg/graph-model/widgets' import { IS_CONTROL_WIDGET } from '@/core/graph/widgets/controlWidgetMarker' import type { NodeId } from '@comfyorg/graph-model/nodeId' diff --git a/src/types/widgetConstructor.ts b/src/types/widgetConstructor.ts index 62997864555..d4743c45e52 100644 --- a/src/types/widgetConstructor.ts +++ b/src/types/widgetConstructor.ts @@ -1,6 +1,6 @@ import type { LGraphNode } from '@/lib/litegraph/src/litegraph' import type { IBaseWidget } from '@comfyorg/graph-model/widgets' -import type { InputSpec as InputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec as InputSpecV2 } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' export type ComfyWidgetConstructorV2 = ( node: LGraphNode, diff --git a/src/utils/litegraphUtil.test.ts b/src/utils/litegraphUtil.test.ts index ab54adc83ec..c6f603ef7b0 100644 --- a/src/utils/litegraphUtil.test.ts +++ b/src/utils/litegraphUtil.test.ts @@ -5,7 +5,7 @@ import type { LGraphCanvas } from '@/lib/litegraph/src/litegraph' import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' import { createTestSubgraph } from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers' import type { IBaseWidget } from '@comfyorg/graph-model/widgets' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import { toNodeId } from '@comfyorg/graph-model/nodeId' import { widgetId } from '@comfyorg/graph-model/widgetId' import { createMockLGraphNode } from '@/utils/__tests__/litegraphTestUtils' diff --git a/src/utils/litegraphUtil.ts b/src/utils/litegraphUtil.ts index c4faeea70f8..aba52b806aa 100644 --- a/src/utils/litegraphUtil.ts +++ b/src/utils/litegraphUtil.ts @@ -19,8 +19,8 @@ import type { IComboWidget, WidgetCallbackOptions } from '@comfyorg/graph-model/widgets' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' -import { inputSpecTree } from '@/schemas/nodeDef/inputSpecTree' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' +import { inputSpecTree } from '@/core/graph/nodeDef/inputSpecInterpreter' import { useApp } from '@/scripts/appInstance' import { parseNodeLocatorId } from '@comfyorg/graph-model/nodeIdentification' import type { SerializedNodeId } from '@comfyorg/graph-model/nodeId' diff --git a/src/utils/nodeDefUtil.test.ts b/src/utils/nodeDefUtil.test.ts index 50061eb6fdf..7b4ff5f45fa 100644 --- a/src/utils/nodeDefUtil.test.ts +++ b/src/utils/nodeDefUtil.test.ts @@ -7,7 +7,7 @@ import type { FloatInputSpec, InputSpec, IntInputSpec -} from '@/schemas/nodeDefSchema' +} from '@comfyorg/object-info-parser' import { mergeInputSpec } from '@/utils/nodeDefUtil' describe('nodeDefUtil', () => { diff --git a/src/utils/nodeDefUtil.ts b/src/utils/nodeDefUtil.ts index 6de07595661..451836c9aa1 100644 --- a/src/utils/nodeDefUtil.ts +++ b/src/utils/nodeDefUtil.ts @@ -7,14 +7,14 @@ import type { InputSpec, IntInputSpec, NumericInputOptions -} from '@/schemas/nodeDefSchema' +} from '@comfyorg/object-info-parser' import { getComboSpecComboOptions, getInputSpecType, isComboInputSpec, isFloatInputSpec, isIntInputSpec -} from '@/schemas/nodeDefSchema' +} from '@comfyorg/object-info-parser' import { lcm } from './mathUtil' diff --git a/src/utils/widgetUtil.test.ts b/src/utils/widgetUtil.test.ts index ce7f53343d7..851fd0030b9 100644 --- a/src/utils/widgetUtil.test.ts +++ b/src/utils/widgetUtil.test.ts @@ -4,7 +4,7 @@ import { describe, expect, it } from 'vitest' import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode' import type { INodeInputSlot } from '@comfyorg/graph-model/slots' import type { IBaseWidget } from '@comfyorg/graph-model/widgets' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import { getWidgetDefaultValue, renameWidget } from '@/utils/widgetUtil' import type { WidgetId } from '@comfyorg/graph-model/widgetId' import { useWidgetValueStore } from '@/stores/widgetValueStore' diff --git a/src/utils/widgetUtil.ts b/src/utils/widgetUtil.ts index 69750dceffe..6569b1112e3 100644 --- a/src/utils/widgetUtil.ts +++ b/src/utils/widgetUtil.ts @@ -2,7 +2,7 @@ import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode' import { NodeSlotType } from '@comfyorg/graph-model/globalEnums' import type { IBaseWidget } from '@comfyorg/graph-model/widgets' import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import { useDialogService } from '@/services/dialogService' import { useWidgetValueStore } from '@/stores/widgetValueStore' diff --git a/src/workbench/extensions/agent/crdt/agentCrdtProjection.reconnectAdoptionRace.test.ts b/src/workbench/extensions/agent/crdt/agentCrdtProjection.reconnectAdoptionRace.test.ts index e41dc861898..93ef6e9e308 100644 --- a/src/workbench/extensions/agent/crdt/agentCrdtProjection.reconnectAdoptionRace.test.ts +++ b/src/workbench/extensions/agent/crdt/agentCrdtProjection.reconnectAdoptionRace.test.ts @@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it } from 'vitest' import * as Y from 'yjs' import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' -import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration' +import { transformInputSpecV1ToV2 } from '@comfyorg/object-info-parser/migration' import { useLitegraphService } from '@/services/litegraphService' import { app } from '@/scripts/app' import type { NodeId } from '@comfyorg/graph-model/nodeId' diff --git a/src/workbench/extensions/agent/crdt/agentDisplayIntAdd.regression.test.ts b/src/workbench/extensions/agent/crdt/agentDisplayIntAdd.regression.test.ts index 74d650766be..25de8e833e1 100644 --- a/src/workbench/extensions/agent/crdt/agentDisplayIntAdd.regression.test.ts +++ b/src/workbench/extensions/agent/crdt/agentDisplayIntAdd.regression.test.ts @@ -6,7 +6,7 @@ import { defineComponent, ref } from 'vue' import { useToast } from '@/components/ui/toast/toastStore' import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import { useNodeDefStore } from '@/stores/nodeDefStore' import { toRootGraphId } from '@comfyorg/graph-model/graphScopeId' import { useAgentPanelStore } from '@/workbench/extensions/agent/stores/agent/agentPanelStore' diff --git a/src/workbench/extensions/agent/crdt/agentDynamicComboChildWrite.regression.test.ts b/src/workbench/extensions/agent/crdt/agentDynamicComboChildWrite.regression.test.ts index 0024ede7011..9b71a97de97 100644 --- a/src/workbench/extensions/agent/crdt/agentDynamicComboChildWrite.regression.test.ts +++ b/src/workbench/extensions/agent/crdt/agentDynamicComboChildWrite.regression.test.ts @@ -18,11 +18,11 @@ import { import type { GraphIntentEvent } from '@/lib/litegraph/src/graphIntents' import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' import type { ISerialisedGraph } from '@comfyorg/graph-model/serialisation' -import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration' +import { transformInputSpecV1ToV2 } from '@comfyorg/object-info-parser/migration' import type { ComfyNodeDef as ComfyNodeDefV1, InputSpec -} from '@/schemas/nodeDefSchema' +} from '@comfyorg/object-info-parser' import { useLitegraphService } from '@/services/litegraphService' import { useNodeDefStore } from '@/stores/nodeDefStore' import { toRootGraphId } from '@comfyorg/graph-model/graphScopeId' diff --git a/src/workbench/extensions/agent/crdt/agentGrownDynamicSlot.regression.test.ts b/src/workbench/extensions/agent/crdt/agentGrownDynamicSlot.regression.test.ts index 06b1388e13b..080094ab0c0 100644 --- a/src/workbench/extensions/agent/crdt/agentGrownDynamicSlot.regression.test.ts +++ b/src/workbench/extensions/agent/crdt/agentGrownDynamicSlot.regression.test.ts @@ -7,7 +7,7 @@ import type { import { beforeEach, describe, expect, it } from 'vitest' import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' -import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration' +import { transformInputSpecV1ToV2 } from '@comfyorg/object-info-parser/migration' import { useLitegraphService } from '@/services/litegraphService' import { toLinkId } from '@comfyorg/graph-model/linkId' import { toNodeId } from '@comfyorg/graph-model/nodeId' diff --git a/src/workbench/extensions/agent/crdt/agentUndoRestoreDisplayWidget.regression.test.ts b/src/workbench/extensions/agent/crdt/agentUndoRestoreDisplayWidget.regression.test.ts index 7abea1efce5..f9c8aeb2796 100644 --- a/src/workbench/extensions/agent/crdt/agentUndoRestoreDisplayWidget.regression.test.ts +++ b/src/workbench/extensions/agent/crdt/agentUndoRestoreDisplayWidget.regression.test.ts @@ -12,7 +12,7 @@ import { import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' import type { ISerialisedGraph } from '@comfyorg/graph-model/serialisation' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import { useNodeDefStore } from '@/stores/nodeDefStore' import type { GraphOperation } from './graphOperations' diff --git a/src/workbench/extensions/agent/crdt/agentWriteOverwrites.test.ts b/src/workbench/extensions/agent/crdt/agentWriteOverwrites.test.ts index 8f8bd0e9dba..4541db57a78 100644 --- a/src/workbench/extensions/agent/crdt/agentWriteOverwrites.test.ts +++ b/src/workbench/extensions/agent/crdt/agentWriteOverwrites.test.ts @@ -18,8 +18,8 @@ import type { import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' import { createTestSubgraphData } from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers' import type { ISerialisedGraph } from '@comfyorg/graph-model/serialisation' -import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration' -import type { InputSpec } from '@/schemas/nodeDefSchema' +import { transformInputSpecV1ToV2 } from '@comfyorg/object-info-parser/migration' +import type { InputSpec } from '@comfyorg/object-info-parser' import { useLitegraphService } from '@/services/litegraphService' import { reportError } from '@comfyorg/telemetry/reportError' diff --git a/src/workbench/extensions/agent/crdt/docOpMinter.test.ts b/src/workbench/extensions/agent/crdt/docOpMinter.test.ts index 4d8460ef571..bdba83233d8 100644 --- a/src/workbench/extensions/agent/crdt/docOpMinter.test.ts +++ b/src/workbench/extensions/agent/crdt/docOpMinter.test.ts @@ -22,8 +22,8 @@ import { createTestSubgraphNode } from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers' import { reportError } from '@comfyorg/telemetry/reportError' -import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +import { transformInputSpecV1ToV2 } from '@comfyorg/object-info-parser/migration' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import { useNodeDefStore } from '@/stores/nodeDefStore' import { useLitegraphService } from '@/services/litegraphService' import { useWidgetValueStore } from '@/stores/widgetValueStore' diff --git a/src/workbench/extensions/agent/crdt/liveGraphApplier.primitiveIntControl.test.ts b/src/workbench/extensions/agent/crdt/liveGraphApplier.primitiveIntControl.test.ts index b1f9499012f..85bdfcacacf 100644 --- a/src/workbench/extensions/agent/crdt/liveGraphApplier.primitiveIntControl.test.ts +++ b/src/workbench/extensions/agent/crdt/liveGraphApplier.primitiveIntControl.test.ts @@ -6,7 +6,7 @@ import * as Y from 'yjs' import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' import { reportError } from '@comfyorg/telemetry/reportError' -import type { InputSpec } from '@/schemas/nodeDefSchema' +import type { InputSpec } from '@comfyorg/object-info-parser' import { ComfyWidgets } from '@/scripts/widgets' import { toNodeId } from '@comfyorg/graph-model/nodeId' diff --git a/src/workbench/extensions/agent/crdt/liveGraphApplier.test.ts b/src/workbench/extensions/agent/crdt/liveGraphApplier.test.ts index 27fe569bf14..679be333122 100644 --- a/src/workbench/extensions/agent/crdt/liveGraphApplier.test.ts +++ b/src/workbench/extensions/agent/crdt/liveGraphApplier.test.ts @@ -35,7 +35,7 @@ import type { LGraphCanvas } from '@/lib/litegraph/src/litegraph' import { reportError } from '@comfyorg/telemetry/reportError' -import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration' +import { transformInputSpecV1ToV2 } from '@comfyorg/object-info-parser/migration' import { toLinkId } from '@comfyorg/graph-model/linkId' import { toRootGraphId } from '@comfyorg/graph-model/graphScopeId' import { toNodeId } from '@comfyorg/graph-model/nodeId' diff --git a/src/workbench/extensions/agent/crdt/liveGraphApplier.ts b/src/workbench/extensions/agent/crdt/liveGraphApplier.ts index 37fce6aa625..97bfbcafe8e 100644 --- a/src/workbench/extensions/agent/crdt/liveGraphApplier.ts +++ b/src/workbench/extensions/agent/crdt/liveGraphApplier.ts @@ -36,7 +36,7 @@ import { isWidgetValue } from '@comfyorg/graph-model/widgets' import { reportError } from '@comfyorg/telemetry/reportError' import { zComfyNode } from '@comfyorg/graph-model/workflowSchema' import { BaseWidget } from '@/lib/litegraph/src/widgets/BaseWidget' -import { inputSpecTree } from '@/schemas/nodeDef/inputSpecTree' +import { inputSpecTree } from '@/core/graph/nodeDef/inputSpecInterpreter' import { isUuidShapedSubgraphId } from '@/schemas/subgraphIdSchema' import type { LinkId } from '@comfyorg/graph-model/linkId' import { parseLinkId, toLinkId } from '@comfyorg/graph-model/linkId' diff --git a/src/workbench/extensions/agent/crdt/loadImageLivePreview.test.ts b/src/workbench/extensions/agent/crdt/loadImageLivePreview.test.ts index 10d5d3fa0e1..3f38c588e74 100644 --- a/src/workbench/extensions/agent/crdt/loadImageLivePreview.test.ts +++ b/src/workbench/extensions/agent/crdt/loadImageLivePreview.test.ts @@ -16,7 +16,7 @@ import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' // callback a production LoadImage node does. // oxlint-disable-next-line comfy/no-restricted-paths import { useImageUploadWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useImageUploadWidget' -import type { InputSpec } from '@/schemas/nodeDefSchema' +import type { InputSpec } from '@comfyorg/object-info-parser' import { toNodeId } from '@comfyorg/graph-model/nodeId' import { AgentCrdtProjection } from './agentCrdtProjection' diff --git a/src/workbench/extensions/agent/crdt/widgetValuesForm.test.ts b/src/workbench/extensions/agent/crdt/widgetValuesForm.test.ts index 57af9637915..9b0139b42aa 100644 --- a/src/workbench/extensions/agent/crdt/widgetValuesForm.test.ts +++ b/src/workbench/extensions/agent/crdt/widgetValuesForm.test.ts @@ -5,7 +5,7 @@ import { setAssertReporter } from '@/base/assert' import { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph' import type { ISerialisedNode } from '@comfyorg/graph-model/serialisation' import { reportError } from '@comfyorg/telemetry/reportError' -import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef as ComfyNodeDefV1 } from '@comfyorg/object-info-parser' import { useNodeDefStore } from '@/stores/nodeDefStore' import { diff --git a/src/workbench/utils/nodeDefOrderingUtil.test.ts b/src/workbench/utils/nodeDefOrderingUtil.test.ts index ba705ccedec..246f127cb66 100644 --- a/src/workbench/utils/nodeDefOrderingUtil.test.ts +++ b/src/workbench/utils/nodeDefOrderingUtil.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' +import type { ComfyNodeDef } from '@comfyorg/object-info-parser' import { ComfyNodeDefImpl } from '@/core/graph/nodeDef/ComfyNodeDefImpl' import { getOrderedInputSpecs, diff --git a/src/workbench/utils/nodeDefOrderingUtil.ts b/src/workbench/utils/nodeDefOrderingUtil.ts index fcd86d704d1..46b07a4c7c2 100644 --- a/src/workbench/utils/nodeDefOrderingUtil.ts +++ b/src/workbench/utils/nodeDefOrderingUtil.ts @@ -1,5 +1,5 @@ import type { TWidgetValue } from '@/lib/litegraph/src/litegraph' -import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' +import type { InputSpec } from '@comfyorg/object-info-parser/schemas/nodeDefSchemaV2' import type { ComfyNodeDefImpl } from '@/core/graph/nodeDef/ComfyNodeDefImpl' /**