Refactor input default value handling and consolidate utility functions

Author: j-sanaa

packages/agentflow/src/atoms/ArrayInput.tsx

@@ -5,6 +5,7 @@ import { useTheme } from '@mui/material/styles'
 import { IconPlus, IconTrash } from '@tabler/icons-react'
 
 import type { InputParam, NodeData } from '@/core/types'
+import { getDefaultValueForType } from '@/core/utils/inputDefaults'
 
 import { type AsyncInputProps, type ConfigInputComponentProps, NodeInputHandler } from './NodeInputHandler'
 import { useStableKeys } from './useStableKeys'
@@ -75,23 +76,7 @@ export function ArrayInput({
 
         if (inputParam.array) {
             for (const field of inputParam.array) {
-                if (field.default !== undefined) {
-                    newItem[field.name] = field.default
-                } else {
-                    switch (field.type) {
-                        case 'number':
-                            newItem[field.name] = 0
-                            break
-                        case 'boolean':
-                            newItem[field.name] = false
-                            break
-                        case 'array':
-                            newItem[field.name] = []
-                            break
-                        default:
-                            newItem[field.name] = ''
-                    }
-                }
+                newItem[field.name] = getDefaultValueForType(field)
             }
         }
 

packages/agentflow/src/atoms/ConditionBuilder.tsx

@@ -5,6 +5,7 @@ import { useTheme } from '@mui/material/styles'
 import { IconPlus, IconTrash } from '@tabler/icons-react'
 
 import type { InputParam, NodeData } from '@/core/types'
+import { getDefaultValueForType } from '@/core/utils/inputDefaults'
 
 import { NodeInputHandler } from './NodeInputHandler'
 import { useStableKeys } from './useStableKeys'
@@ -58,20 +59,7 @@ export function ConditionBuilder({
         const newItem: Record<string, unknown> = {}
         if (inputParam.array) {
             for (const field of inputParam.array) {
-                if (field.default != null) {
-                    newItem[field.name] = field.default
-                } else {
-                    switch (field.type) {
-                        case 'number':
-                            newItem[field.name] = 0
-                            break
-                        case 'boolean':
-                            newItem[field.name] = false
-                            break
-                        default:
-                            newItem[field.name] = ''
-                    }
-                }
+                newItem[field.name] = getDefaultValueForType(field)
             }
         }
         onDataChange?.({ inputParam, newValue: [...arrayItems, newItem] })

packages/agentflow/src/core/utils/credentialDefaults.ts

@@ -10,5 +10,5 @@ export { evaluateFieldVisibility, evaluateParamVisibility, stripHiddenFieldValue
 // Dynamic output anchor utilities
 export { buildDynamicOutputAnchors, parseOutputHandleIndex } from './dynamicOutputAnchors'
 
-// Credential utilities
-export { getDefaultValueForType } from './credentialDefaults'
+// Input default value utilities
+export { getDefaultValueForType } from './inputDefaults'

packages/agentflow/src/core/utils/index.ts

@@ -1,11 +1,7 @@
-import type { CredentialSchemaInput } from '@/core/types'
+import { getDefaultValueForType } from './inputDefaults'
 
-import { getDefaultValueForType } from './credentialDefaults'
-
-const makeInput = (overrides: Partial<CredentialSchemaInput> = {}): CredentialSchemaInput => ({
-    label: 'Test',
-    name: 'test',
-    type: 'string',
+const makeInput = (overrides: Record<string, unknown> = {}) => ({
+    type: 'string' as string,
     ...overrides
 })
 
@@ -32,15 +28,26 @@ describe('getDefaultValueForType', () => {
         expect(getDefaultValueForType(makeInput({ type: 'json' }))).toBe('{}')
     })
 
-    it('returns first option name for options with options present', () => {
-        const input = makeInput({
-            type: 'options',
-            options: [
-                { label: 'First', name: 'first' },
-                { label: 'Second', name: 'second' }
-            ]
-        })
-        expect(getDefaultValueForType(input)).toBe('first')
+    it('returns [] for array', () => {
+        expect(getDefaultValueForType(makeInput({ type: 'array' }))).toEqual([])
+    })
+
+    it('returns first option name for object options', () => {
+        expect(
+            getDefaultValueForType(
+                makeInput({
+                    type: 'options',
+                    options: [
+                        { label: 'First', name: 'first' },
+                        { label: 'Second', name: 'second' }
+                    ]
+                })
+            )
+        ).toBe('first')
+    })
+
+    it('returns first option value for string options', () => {
+        expect(getDefaultValueForType(makeInput({ type: 'options', options: ['alpha', 'beta'] }))).toBe('alpha')
     })
 
     it("returns '' for options with no options", () => {
@@ -57,6 +64,17 @@ describe('getDefaultValueForType', () => {
     })
 
     it("returns '' for unknown type", () => {
-        expect(getDefaultValueForType(makeInput({ type: 'unknown' as CredentialSchemaInput['type'] }))).toBe('')
+        expect(getDefaultValueForType(makeInput({ type: 'somethingElse' }))).toBe('')
+    })
+
+    it('works with InputParam-shaped objects', () => {
+        // InputParam has id, name, label, type, etc.
+        const inputParam = { id: 'p1', name: 'field', label: 'Field', type: 'boolean' }
+        expect(getDefaultValueForType(inputParam)).toBe(false)
+    })
+
+    it('works with CredentialSchemaInput-shaped objects', () => {
+        const credInput = { label: 'API Key', name: 'apiKey', type: 'password' }
+        expect(getDefaultValueForType(credInput)).toBe('')
     })
 })

…rc/core/utils/credentialDefaults.test.ts …low/src/core/utils/inputDefaults.test.tspackages/agentflow/src/core/utils/credentialDefaults.test.ts renamed to packages/agentflow/src/core/utils/inputDefaults.test.ts packages/agentflow/src/core/utils/credentialDefaults.test.ts renamed to packages/agentflow/src/core/utils/inputDefaults.test.ts

@@ -0,0 +1,40 @@
+/**
+ * Minimal shape accepted by getDefaultValueForType.
+ * Both InputParam and CredentialSchemaInput satisfy this interface.
+ */
+interface TypedInput {
+    type: string
+    default?: unknown
+    options?: Array<{ name: string } | string>
+}
+
+/**
+ * Returns the appropriate default value for an input based on its type.
+ * If the input already defines a `default`, that value is returned as-is.
+ *
+ * Works with any input shape that has `type`, optional `default`, and optional `options`
+ * (e.g. InputParam, CredentialSchemaInput).
+ */
+export function getDefaultValueForType(input: TypedInput): unknown {
+    if (input.default !== undefined) return input.default
+
+    switch (input.type) {
+        case 'boolean':
+            return false
+        case 'number':
+            return 0
+        case 'json':
+            return '{}'
+        case 'array':
+            return []
+        case 'options': {
+            const first = input.options?.[0]
+            if (!first) return ''
+            return typeof first === 'string' ? first : first.name
+        }
+        case 'string':
+        case 'password':
+        default:
+            return ''
+    }
+}

packages/agentflow/src/core/utils/inputDefaults.ts

@@ -1,6 +1,7 @@
 import type { FlowNode, NodeData, OutputAnchor } from '../types'
 
 import { buildDynamicOutputAnchors } from './dynamicOutputAnchors'
+import { getDefaultValueForType } from './inputDefaults'
 
 /**
  * Map from NodeData.type to the ReactFlow node type key.
@@ -55,11 +56,13 @@ export function getUniqueNodeLabel(nodeData: NodeData, nodes: FlowNode[]): strin
  * Initialize default values for node parameters.
  * Falls back to '' for params without a default — needed by show/hide condition evaluation.
  */
-function initializeDefaultNodeData(nodeParams: Array<{ name: string; default?: unknown }>): Record<string, unknown> {
+function initializeDefaultNodeData(
+    nodeParams: Array<{ name: string; type: string; default?: unknown; options?: Array<{ name: string } | string> }>
+): Record<string, unknown> {
     const initialValues: Record<string, unknown> = {}
 
     for (const input of nodeParams) {
-        initialValues[input.name] = input.default ?? ''
+        initialValues[input.name] = getDefaultValueForType(input)
     }
 
     return initialValues

packages/agentflow/src/core/utils/nodeFactory.ts

@@ -7,7 +7,7 @@ import { IconSettings } from '@tabler/icons-react'
 
 import { type AsyncInputProps, NodeInputHandler } from '@/atoms'
 import type { InputParam, NodeData } from '@/core/types'
-import { evaluateFieldVisibility, initNode } from '@/core/utils'
+import { evaluateFieldVisibility, getDefaultValueForType, initNode } from '@/core/utils'
 import { useApiContext } from '@/infrastructure/store'
 
 // ─── Props ────────────────────────────────────────────────────────────────────
@@ -33,7 +33,7 @@ export interface ConfigInputProps {
 function initializeDefaults(params: InputParam[]): Record<string, unknown> {
     const defaults: Record<string, unknown> = {}
     for (const p of params) {
-        defaults[p.name] = p.default ?? ''
+        defaults[p.name] = getDefaultValueForType(p)
     }
     return defaults
 }

packages/agentflow/src/features/node-editor/ConfigInput.tsx

@@ -21,7 +21,7 @@ import { JsonInput } from '@/atoms/JsonInput'
 import { SwitchInput } from '@/atoms/SwitchInput'
 import { TooltipWithParser } from '@/atoms/TooltipWithParser'
 import type { ComponentCredentialSchema, CredentialSchemaInput } from '@/core/types'
-import { getDefaultValueForType } from '@/core/utils/credentialDefaults'
+import { getDefaultValueForType } from '@/core/utils/inputDefaults'
 import { useApiContext } from '@/infrastructure/store/ApiContext'
 
 export interface CreateCredentialDialogProps {

packages/agentflow/src/features/node-editor/CreateCredentialDialog.tsx

@@ -14,7 +14,7 @@ import type {
     InputParam,
     NodeData
 } from '@/core/types'
-import { getUniqueNodeId } from '@/core/utils'
+import { getDefaultValueForType, getUniqueNodeId } from '@/core/utils'
 
 import { agentflowReducer, initialState, normalizeNodes } from './agentflowReducer'
 
@@ -216,7 +216,7 @@ export function AgentflowStateProvider({ children, initialFlow }: AgentflowState
                     if (isConnectionString(value)) {
                         // Reset string connections to parameter default
                         const inputParam = newNode.data.inputs?.find((p) => p.name === inputName)
-                        newNode.data.inputValues[inputName] = inputParam?.default ?? ''
+                        newNode.data.inputValues[inputName] = inputParam ? getDefaultValueForType(inputParam) : ''
                     } else if (Array.isArray(value)) {
                         // Filter out connection strings from arrays
                         newNode.data.inputValues[inputName] = value.filter((item) => !isConnectionString(item))