Road to No Explicit Any Part 8 (Group4)

src/lib/litegraph/src/LGraph.ts

@@ -2602,7 +2602,16 @@ export class Subgraph
     canvas.subgraph = this
   }
 
-  addInput(name: string, type: string): SubgraphInput {
+  addInput(name?: string | null, type?: string | null): SubgraphInput {
+    if (
+      name === null ||
+      name === undefined ||
+      type === null ||
+      type === undefined
+    ) {
+      throw new Error('Name and type are required for subgraph input')
+    }
+
     this.events.dispatch('adding-input', { name, type })
 
     const input = new SubgraphInput(
@@ -2620,7 +2629,16 @@ export class Subgraph
     return input
   }
 
-  addOutput(name: string, type: string): SubgraphOutput {
+  addOutput(name?: string | null, type?: string | null): SubgraphOutput {
+    if (
+      name === null ||
+      name === undefined ||
+      type === null ||
+      type === undefined
+    ) {
+      throw new Error('Name and type are required for subgraph output')
+    }
+
     this.events.dispatch('adding-output', { name, type })
 
     const output = new SubgraphOutput(

src/lib/litegraph/src/interfaces.ts

@@ -254,7 +254,10 @@ type KeysOfType<T, Match> = Exclude<
 >
 
 /** The names of all (optional) methods and functions in T */
-export type MethodNames<T> = KeysOfType<T, ((...args: any) => any) | undefined>
+export type MethodNames<T> = KeysOfType<
+  T,
+  ((...args: unknown[]) => unknown) | undefined
+>
 export interface NewNodePosition {
   node: LGraphNode
   newPos: {
@@ -459,28 +462,6 @@ export interface ISubgraphInput extends INodeInputSlot {
   _subgraphSlot: SubgraphInput
 }
 
-/**
- * Shorthand for {@link Parameters} of optional callbacks.
- * @example
- * ```ts
- * const { onClick } = CustomClass.prototype
- * CustomClass.prototype.onClick = function (...args: CallbackParams<typeof onClick>) {
- *   const r = onClick?.apply(this, args)
- *   // ...
- *   return r
- * }
- * ```
- */
-export type CallbackParams<T extends ((...args: any) => any) | undefined> =
-  Parameters<Exclude<T, undefined>>
-
-/**
- * Shorthand for {@link ReturnType} of optional callbacks.
- * @see {@link CallbackParams}
- */
-export type CallbackReturn<T extends ((...args: any) => any) | undefined> =
-  ReturnType<Exclude<T, undefined>>
-
 /**
  * An object that can be hovered over.
  */

src/lib/litegraph/src/subgraph/ExecutableNodeDTO.ts

@@ -4,11 +4,7 @@ import { InvalidLinkError } from '@/lib/litegraph/src/infrastructure/InvalidLink
 import { NullGraphError } from '@/lib/litegraph/src/infrastructure/NullGraphError'
 import { RecursionError } from '@/lib/litegraph/src/infrastructure/RecursionError'
 import { SlotIndexError } from '@/lib/litegraph/src/infrastructure/SlotIndexError'
-import type {
-  CallbackParams,
-  CallbackReturn,
-  ISlotType
-} from '@/lib/litegraph/src/interfaces'
+import type { ISlotType } from '@/lib/litegraph/src/interfaces'
 import { LGraphEventMode, LiteGraph } from '@/lib/litegraph/src/litegraph'
 
 import type { Subgraph } from './Subgraph'
@@ -45,8 +41,8 @@ type ResolvedInput = {
  */
 export class ExecutableNodeDTO implements ExecutableLGraphNode {
   applyToGraph?(
-    ...args: CallbackParams<typeof this.node.applyToGraph>
-  ): CallbackReturn<typeof this.node.applyToGraph>
+    ...args: Parameters<NonNullable<typeof this.node.applyToGraph>>
+  ): ReturnType<NonNullable<typeof this.node.applyToGraph>>
 
   /** The graph that this node is a part of. */
   readonly graph: LGraph | Subgraph

src/lib/litegraph/src/subgraph/SubgraphEdgeCases.test.ts

@@ -83,7 +83,9 @@ describe.skip('SubgraphEdgeCases - Invalid States', () => {
       name: 'fake',
       type: 'number',
       disconnect: () => {}
-    } as any
+    } as Partial<Parameters<typeof subgraph.removeInput>[0]> as Parameters<
+      typeof subgraph.removeInput
+    >[0]
 
     // Should throw appropriate error for non-existent input
     expect(() => {
@@ -97,41 +99,36 @@ describe.skip('SubgraphEdgeCases - Invalid States', () => {
       name: 'fake',
       type: 'number',
       disconnect: () => {}
-    } as any
+    } as Partial<Parameters<typeof subgraph.removeOutput>[0]> as Parameters<
+      typeof subgraph.removeOutput
+    >[0]
 
     expect(() => {
       subgraph.removeOutput(fakeOutput)
     }).toThrow(/Output not found/) // Expected error
   })
 
-  it('should handle null/undefined input names', () => {
+  it('should throw error for null/undefined input names', () => {
     const subgraph = createTestSubgraph()
 
-    // ISSUE: Current implementation allows null/undefined names which may cause runtime errors
-    // TODO: Consider adding validation to prevent null/undefined names
-    // This test documents the current permissive behavior
     expect(() => {
-      subgraph.addInput(null as any, 'number')
-    }).not.toThrow() // Current behavior: allows null
+      subgraph.addInput(null, 'number')
+    }).toThrow() // Current behavior: allows null
 
     expect(() => {
-      subgraph.addInput(undefined as any, 'number')
-    }).not.toThrow() // Current behavior: allows undefined
+      subgraph.addInput(undefined, 'number')
+    }).toThrow() // Current behavior: allows undefined
   })
 
   it('should handle null/undefined output names', () => {
     const subgraph = createTestSubgraph()
-
-    // ISSUE: Current implementation allows null/undefined names which may cause runtime errors
-    // TODO: Consider adding validation to prevent null/undefined names
-    // This test documents the current permissive behavior
     expect(() => {
-      subgraph.addOutput(null as any, 'number')
-    }).not.toThrow() // Current behavior: allows null
+      subgraph.addOutput(null, 'number')
+    }).toThrow()
 
     expect(() => {
-      subgraph.addOutput(undefined as any, 'number')
-    }).not.toThrow() // Current behavior: allows undefined
+      subgraph.addOutput(undefined, 'number')
+    }).toThrow()
   })
 
   it('should handle empty string names', () => {
@@ -153,11 +150,11 @@ describe.skip('SubgraphEdgeCases - Invalid States', () => {
 
     // Undefined type should not crash but may have default behavior
     expect(() => {
-      subgraph.addInput('test', undefined as any)
+      subgraph.addInput('test', undefined)
     }).not.toThrow()
 
     expect(() => {
-      subgraph.addOutput('test', undefined as any)
+      subgraph.addOutput('test', undefined)
     }).not.toThrow()
   })
 

src/lib/litegraph/src/subgraph/SubgraphMemory.test.ts

@@ -10,6 +10,12 @@ import {
   createTestSubgraphNode
 } from './__fixtures__/subgraphHelpers'
 
+type InputWithWidget = {
+  _widget?: IWidget | { type: string; value: unknown; name: string }
+  _connection?: { id: number; type: string }
+  _listenerController?: AbortController
+}
+
 describe.skip('SubgraphNode Memory Management', () => {
   describe.skip('Event Listener Cleanup', () => {
     it('should register event listeners on construction', () => {
@@ -308,14 +314,14 @@ describe.skip('SubgraphMemory - Widget Reference Management', () => {
 
       // Set widget reference
       if (input && '_widget' in input) {
-        ;(input as any)._widget = mockWidget
-        expect((input as any)._widget).toBe(mockWidget)
+        ;(input as InputWithWidget)._widget = mockWidget
+        expect((input as InputWithWidget)._widget).toBe(mockWidget)
       }
 
       // Clear widget reference
       if (input && '_widget' in input) {
-        ;(input as any)._widget = undefined
-        expect((input as any)._widget).toBeUndefined()
+        ;(input as InputWithWidget)._widget = undefined
+        expect((input as InputWithWidget)._widget).toBeUndefined()
       }
     }
   )
@@ -360,30 +366,34 @@ describe.skip('SubgraphMemory - Widget Reference Management', () => {
 
       // Set up references that should be cleaned up
       const mockReferences = {
-        widget: { type: 'number', value: 42 },
+        widget: { type: 'number', value: 42, name: 'mock_widget' },
         connection: { id: 1, type: 'number' },
         listener: vi.fn()
       }
 
       // Set references
       if (input) {
-        ;(input as any)._widget = mockReferences.widget
-        ;(input as any)._connection = mockReferences.connection
+        ;(input as InputWithWidget)._widget = mockReferences.widget
+        ;(input as InputWithWidget)._connection = mockReferences.connection
       }
       if (output) {
-        ;(input as any)._connection = mockReferences.connection
+        ;(input as InputWithWidget)._connection = mockReferences.connection
       }
 
       // Verify references are set
-      expect((input as any)?._widget).toBe(mockReferences.widget)
-      expect((input as any)?._connection).toBe(mockReferences.connection)
+      expect((input as InputWithWidget)?._widget).toBe(mockReferences.widget)
+      expect((input as InputWithWidget)?._connection).toBe(
+        mockReferences.connection
+      )
 
       // Simulate proper cleanup (what onRemoved should do)
       subgraphNode.onRemoved()
 
       // Input-specific listeners should be cleaned up (this works)
       if (input && '_listenerController' in input) {
-        expect((input as any)._listenerController?.signal.aborted).toBe(true)
+        expect(
+          (input as InputWithWidget)._listenerController?.signal.aborted
+        ).toBe(true)
       }
     }
   )

src/lib/litegraph/src/subgraph/SubgraphNode.test.ts

@@ -9,6 +9,7 @@ import { describe, expect, it, vi } from 'vitest'
 
 import type { SubgraphNode } from '@/lib/litegraph/src/litegraph'
 import { LGraph, Subgraph } from '@/lib/litegraph/src/litegraph'
+import type { SubgraphInput } from '@/lib/litegraph/src/subgraph/SubgraphInput'
 
 import { subgraphTest } from './__fixtures__/subgraphFixtures'
 import {
@@ -531,7 +532,7 @@ describe.skip('SubgraphNode Cleanup', () => {
 
     // Now trigger an event - only node1 should respond
     subgraph.events.dispatch('input-added', {
-      input: { name: 'test', type: 'number', id: 'test-id' } as any
+      input: { name: 'test', type: 'number', id: 'test-id' } as SubgraphInput
     })
 
     // Only node1 should have added an input
@@ -558,7 +559,7 @@ describe.skip('SubgraphNode Cleanup', () => {
 
     // Trigger an event - no nodes should respond
     subgraph.events.dispatch('input-added', {
-      input: { name: 'test', type: 'number', id: 'test-id' } as any
+      input: { name: 'test', type: 'number', id: 'test-id' } as SubgraphInput
     })
 
     // Without cleanup: all 3 removed nodes would have added an input