Use V2 schema in widget constructors (Part 1) (#2860)

src/composables/widgets/useBooleanWidget.ts

@@ -1,28 +1,33 @@
 import type { LGraphNode } from '@comfyorg/litegraph'
 
-import { type InputSpec, isBooleanInputSpec } from '@/schemas/nodeDefSchema'
-import type { ComfyWidgetConstructor } from '@/scripts/widgets'
+import {
+  type InputSpec,
+  isBooleanInputSpec
+} from '@/schemas/nodeDef/nodeDefSchemaV2'
+import { type ComfyWidgetConstructorV2 } from '@/scripts/widgets'
 
 export const useBooleanWidget = () => {
-  const widgetConstructor: ComfyWidgetConstructor = (
+  const widgetConstructor: ComfyWidgetConstructorV2 = (
     node: LGraphNode,
-    inputName: string,
-    inputData: InputSpec
+    inputSpec: InputSpec
   ) => {
-    if (!isBooleanInputSpec(inputData)) {
-      throw new Error(`Invalid input data: ${inputData}`)
+    if (!isBooleanInputSpec(inputSpec)) {
+      throw new Error(`Invalid input data: ${inputSpec}`)
     }
 
-    const inputOptions = inputData[1] ?? {}
-    const defaultVal = inputOptions?.default ?? false
+    const defaultVal = inputSpec.default ?? false
     const options = {
-      on: inputOptions?.label_on,
-      off: inputOptions?.label_off
+      on: inputSpec.label_on,
+      off: inputSpec.label_off
     }
 
-    return {
-      widget: node.addWidget('toggle', inputName, defaultVal, () => {}, options)
-    }
+    return node.addWidget(
+      'toggle',
+      inputSpec.name,
+      defaultVal,
+      () => {},
+      options
+    )
   }
 
   return widgetConstructor