@skopon-cool/form-sdk 0.4.5 → 0.4.6

package/dist/types/index.d.ts

@@ -31,9 +31,17 @@ export interface FormBlockOption {
     value: string;
     label: string;
 }
+export type FormConditionOperator = 'eq' | 'ne' | 'empty' | 'notEmpty';
+export interface FormBlockCondition {
+    fieldName: string;
+    operator: FormConditionOperator;
+    value?: string;
+}
 /** 简历多选组件：渲染时用于 /univ/resume/search 的筛选条件 */
 export interface FormResumeFilter {
     names?: string[];
+    /** Agent 类型（编辑器辅助，运行时不用） */
+    agentKind?: string;
     agentUniqueIds?: string[];
     resumeUniqueIds?: string[];
     pageSize?: number;
@@ -70,6 +78,12 @@ export interface FormBlock {
     fileMinCount?: number;
     fileMaxCount?: number;
     defaultValue?: string | string[] | boolean;
+    /** 派生 JSON Schema 时写入 property.$comment */
+    jsonSchemaDescription?: string;
+    /** 是否隐藏（仅 text 块；隐藏时仍提交） */
+    hidden?: boolean;
+    /** 是否需要 LLM 处理（持久化进 block json） */
+    needLLM?: boolean;
     /** 简历多选：是否显示「换一批」 */
     resumeEnableRefresh?: boolean;
     /** 简历多选：最少选中数量，配置值 ≥ 1 */
@@ -86,6 +100,7 @@ export interface FormBlock {
     caseMaxCount?: number;
     /** 案例单选：列表筛选条件（持久化进 block json） */
     caseFilter?: FormCaseFilter;
+    condition?: FormBlockCondition;
 }
 export interface FormSchema {
     title?: string;
@@ -96,6 +111,9 @@ export interface FormSchema {
 export declare function isMediaBlockType(type: FormBlockType): boolean;
 export declare function isLayoutBlockType(type: FormBlockType): boolean;
 export declare function isInputBlockType(type: FormBlockType): boolean;
+export declare function isDisplayBlockType(type: FormBlockType): boolean;
+export declare function isOptionsBlockType(type: FormBlockType): boolean;
+export declare function supportsDefaultValue(type: FormBlockType): boolean;
 export interface FormDefinitionPayload {
     title?: string;
     description?: string;

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "Skopon form rendering SDK (A2UI + form_definition) with submit helpers",
   "type": "module",
   "sideEffects": [

package/src/adapter/formSchema.test.ts

@@ -2,7 +2,11 @@
  * @vitest-environment node
  */
 import { describe, it, expect } from 'vitest'
-import { coerceToggleValue, normalizeFormDefinition } from './formSchema'
+import {
+  coerceToggleValue,
+  normalizeFormDefinition,
+  blocksToJsonSchema,
+} from './formSchema'
 import { mapFormDefinitionFromDto } from './resolveSurface'
 
 describe('coerceToggleValue', () => {
@@ -38,27 +42,104 @@ describe('normalizeFormDefinition toggle default', () => {
     expect(def.blocks[0]?.defaultValue).toBe(true)
   })
 
-  it('preserves jsonSchema from raw definition', () => {
-    const schema = { type: 'object', properties: { title: { type: 'string' } } }
+  it('regenerates jsonSchema from blocks', () => {
+    const def = normalizeFormDefinition({
+      title: 'Title',
+      description: 'Desc',
+      blocks: [
+        {
+          id: 'b1',
+          type: 'text',
+          name: 'title',
+          label: '标题',
+          required: true,
+        },
+      ],
+      jsonSchema: { type: 'object', properties: { stale: { type: 'number' } } },
+    })
+    expect(def.jsonSchema).toEqual(
+      blocksToJsonSchema(def.blocks, 'Title', 'Desc'),
+    )
+    expect(def.jsonSchema).toMatchObject({
+      type: 'object',
+      properties: { title: { type: 'string' } },
+      required: ['title'],
+    })
+  })
+})
+
+describe('normalizeFormDefinition preserves needLLM and editor fields', () => {
+  it('keeps needLLM, hidden, condition, jsonSchemaDescription after normalize', () => {
+    const def = normalizeFormDefinition({
+      title: '',
+      description: '',
+      blocks: [
+        {
+          id: 'b1',
+          type: 'text',
+          name: 'prompt',
+          label: 'Prompt',
+          needLLM: true,
+          hidden: true,
+          jsonSchemaDescription: 'for agent',
+          condition: { fieldName: 'other', operator: 'eq', value: '1' },
+        },
+        {
+          id: 'b0',
+          type: 'text',
+          name: 'other',
+          label: 'Other',
+        },
+      ],
+      jsonSchema: {},
+    })
+    const block = def.blocks.find((item) => item.name === 'prompt')
+    expect(block?.needLLM).toBe(true)
+    expect(block?.hidden).toBe(true)
+    expect(block?.jsonSchemaDescription).toBe('for agent')
+    expect(block?.condition).toEqual({
+      fieldName: 'other',
+      operator: 'eq',
+      value: '1',
+    })
+  })
+
+  it('keeps resumeFilter.agentKind', () => {
     const def = normalizeFormDefinition({
       title: '',
       description: '',
-      blocks: [],
-      jsonSchema: schema,
+      blocks: [
+        {
+          id: 'b1',
+          type: 'resume_multiselect',
+          name: 'partners',
+          resumeFilter: {
+            agentKind: 'management',
+            names: [],
+            agentUniqueIds: [],
+            resumeUniqueIds: [],
+            pageSize: 20,
+          },
+        },
+      ],
+      jsonSchema: {},
     })
-    expect(def.jsonSchema).toEqual(schema)
+    expect(def.blocks[0]?.resumeFilter?.agentKind).toBe('management')
   })
 })
 
 describe('mapFormDefinitionFromDto jsonSchema', () => {
-  it('reads json_schema snake_case from DTO', () => {
-    const schema = { type: 'object' }
+  it('regenerates jsonSchema from DTO blocks', () => {
     const def = mapFormDefinitionFromDto({
       title: 'T',
       blocks: [{ id: 'b1', type: 'text', name: 'x', label: 'X' }],
-      json_schema: schema,
+      json_schema: { type: 'object', properties: { stale: { type: 'number' } } },
+    })
+    expect(def?.jsonSchema).toMatchObject({
+      type: 'object',
+      title: 'T',
+      properties: { x: { type: 'string' } },
     })
-    expect(def?.jsonSchema).toEqual(schema)
   })
 })
 

package/src/adapter/formSchema.ts

@@ -1,5 +1,12 @@
-import type { FormBlock, FormBlockType, FormCaseFilter, FormResumeFilter, FormJsonSchema, FormSchema } from '../types/index'
-import { isInputBlockType, isMediaBlockType } from '../types/index'
+import type {
+  FormBlock,
+  FormBlockType,
+  FormCaseFilter,
+  FormResumeFilter,
+  FormJsonSchema,
+  FormSchema,
+} from '../types/index'
+import { isInputBlockType, isMediaBlockType, isOptionsBlockType } from '../types/index'
 import { generateId } from './id'
 import {
   filterFileAcceptExtensionsForTypes,
@@ -32,7 +39,7 @@ function normalizeFileUploadCount(raw: unknown, fallback = 1): number {
   return Math.max(0, Math.floor(num))
 }
 
-function normalizeMultiselectCount(raw: unknown, fallback = 1): number {
+export function normalizeMultiselectCount(raw: unknown, fallback = 1): number {
   const num = typeof raw === 'number' ? raw : Number(raw)
   if (!Number.isFinite(num)) return fallback
   return Math.max(1, Math.floor(num))
@@ -42,16 +49,27 @@ function normalizeDefaultValue(
   type: FormBlockType,
   raw: FormBlock['defaultValue'],
 ): FormBlock['defaultValue'] {
-  if (raw === undefined) return undefined
-  if (type === 'toggle') return coerceToggleValue(raw)
-  if (type === 'multiselect' || type === 'checkbox' || type === 'resume_multiselect' || type === 'case_multiselect') {
-    if (Array.isArray(raw)) return raw.map(String)
-    if (typeof raw === 'string' && raw) return [raw]
+  if (raw === undefined || raw === null) return undefined
+  if (type === 'toggle') {
+    return coerceToggleValue(raw)
+  }
+  if (
+    type === 'multiselect' ||
+    type === 'checkbox' ||
+    type === 'resume_multiselect' ||
+    type === 'case_multiselect'
+  ) {
+    if (Array.isArray(raw)) {
+      const values = raw.map(String).map((item) => item.trim()).filter(Boolean)
+      return values
+    }
+    if (typeof raw === 'string' && raw.trim()) return [raw.trim()]
     return []
   }
   if (typeof raw === 'boolean') return raw ? 'true' : 'false'
   if (Array.isArray(raw)) return raw.map(String)
-  return String(raw)
+  const trimmed = String(raw).trim()
+  return trimmed || undefined
 }
 
 /** n8n 等可能把 flowUniqueIds 发成 JSON 数组字符串；解析失败则 []。 */
@@ -100,8 +118,13 @@ function normalizeResumeFilter(raw: FormResumeFilter | undefined): FormResumeFil
     Number.isFinite(pageSizeRaw) && pageSizeRaw >= 1 && pageSizeRaw <= 100
       ? Math.floor(pageSizeRaw)
       : 20
+  const agentKind =
+    typeof raw?.agentKind === 'string' && raw.agentKind.trim()
+      ? raw.agentKind.trim()
+      : undefined
   return {
     names: Array.isArray(raw?.names) ? raw!.names.map(String).filter(Boolean) : [],
+    agentKind,
     agentUniqueIds: Array.isArray(raw?.agentUniqueIds)
       ? raw!.agentUniqueIds.map(String).filter(Boolean)
       : [],
@@ -148,12 +171,22 @@ function normalizeBlock(raw: FormBlock): FormBlock {
     fileMinCount: type === 'file' ? normalizeFileUploadCount(migrated.fileMinCount, 1) : undefined,
     fileMaxCount: type === 'file' ? normalizeFileUploadCount(migrated.fileMaxCount, 1) : undefined,
     defaultValue: normalizeDefaultValue(type, migrated.defaultValue),
+    jsonSchemaDescription: migrated.jsonSchemaDescription?.trim() ?? '',
+    hidden: type === 'text' ? migrated.hidden === true : undefined,
+    needLLM: migrated.needLLM === true ? true : undefined,
     options: Array.isArray(migrated.options)
       ? migrated.options.map((opt, index) => ({
           value: opt.value?.trim() || `option_${index + 1}`,
           label: opt.label?.trim() || `选项 ${index + 1}`,
         }))
       : undefined,
+    condition: migrated.condition?.fieldName
+      ? {
+          fieldName: migrated.condition.fieldName.trim(),
+          operator: migrated.condition.operator ?? 'eq',
+          value: migrated.condition.value,
+        }
+      : undefined,
     resumeEnableRefresh:
       type === 'resume_multiselect' ? migrated.resumeEnableRefresh !== false : undefined,
     resumeMinCount:
@@ -181,12 +214,175 @@ function normalizeBlock(raw: FormBlock): FormBlock {
   }
 }
 
+function getOptionValueSet(block: FormBlock): Set<string> {
+  return new Set((block.options ?? []).map((opt) => opt.value))
+}
+
+function buildMultiselectCountJsonSchema(
+  minCount: number | undefined,
+  maxCount: number | undefined,
+): Record<string, unknown> {
+  const schema: Record<string, unknown> = {
+    type: 'array',
+    items: { type: 'string' },
+  }
+  if (minCount !== undefined) {
+    schema.minItems = normalizeMultiselectCount(minCount, 1)
+  }
+  if (maxCount !== undefined) {
+    schema.maxItems = normalizeMultiselectCount(maxCount, 1)
+  }
+  return schema
+}
+
+export function resolveSchemaDefaultValue(block: FormBlock): unknown | undefined {
+  const normalized = normalizeDefaultValue(block.type, block.defaultValue)
+  if (normalized === undefined) return undefined
+
+  const optionValues = getOptionValueSet(block)
+
+  switch (block.type) {
+    case 'toggle':
+      return normalized as boolean
+    case 'number': {
+      const num = Number(normalized as string)
+      return Number.isNaN(num) ? undefined : num
+    }
+    case 'multiselect':
+    case 'checkbox': {
+      const values = (normalized as string[]).filter((item) => optionValues.has(item))
+      return values.length > 0 ? values : undefined
+    }
+    case 'select':
+    case 'radio': {
+      const value = normalized as string
+      return optionValues.has(value) ? value : undefined
+    }
+    case 'resume_multiselect':
+    case 'case_multiselect': {
+      const values = Array.isArray(normalized)
+        ? (normalized as string[]).map(String).filter(Boolean)
+        : []
+      return values.length > 0 ? values : undefined
+    }
+    default:
+      return normalized
+  }
+}
+
+function blockToJsonSchemaProperty(block: FormBlock): Record<string, unknown> | null {
+  const name = block.name?.trim()
+  if (!name || !isInputBlockType(block.type)) return null
+
+  let property: Record<string, unknown>
+
+  switch (block.type) {
+    case 'number':
+      property = { type: 'number' }
+      break
+    case 'toggle':
+      property = { type: 'boolean' }
+      break
+    case 'select':
+    case 'radio': {
+      property = { type: 'string' }
+      const enumValues = (block.options ?? []).map((opt) => opt.value).filter(Boolean)
+      if (enumValues.length > 0) property.enum = enumValues
+      break
+    }
+    case 'multiselect':
+    case 'checkbox': {
+      const enumValues = (block.options ?? []).map((opt) => opt.value).filter(Boolean)
+      property = {
+        type: 'array',
+        items:
+          enumValues.length > 0
+            ? { type: 'string', enum: enumValues }
+            : { type: 'string' },
+      }
+      break
+    }
+    case 'file': {
+      const minCount = normalizeFileUploadCount(block.fileMinCount, 1)
+      const maxCount = normalizeFileUploadCount(block.fileMaxCount, 1)
+      if (maxCount <= 1) {
+        property = { type: 'string' }
+      } else {
+        property = {
+          type: 'array',
+          items: { type: 'string' },
+          minItems: minCount,
+          maxItems: maxCount,
+        }
+      }
+      break
+    }
+    case 'resume_multiselect':
+      property = buildMultiselectCountJsonSchema(block.resumeMinCount, block.resumeMaxCount)
+      break
+    case 'case_multiselect':
+      property = buildMultiselectCountJsonSchema(block.caseMinCount, block.caseMaxCount)
+      break
+    case 'text':
+      property = { type: 'string' }
+      if (block.hidden) property['x-hidden'] = true
+      break
+    default:
+      property = { type: 'string' }
+      break
+  }
+
+  const comment = block.jsonSchemaDescription?.trim()
+  if (comment) property.$comment = comment
+
+  const defaultValue = resolveSchemaDefaultValue(block)
+  if (defaultValue !== undefined) property.default = defaultValue
+
+  return property
+}
+
+export function blocksToJsonSchema(
+  blocks: FormBlock[],
+  title?: string,
+  description?: string,
+): FormJsonSchema {
+  const properties: Record<string, Record<string, unknown>> = {}
+  const required: string[] = []
+
+  for (const block of blocks) {
+    const name = block.name?.trim()
+    if (!name || !isInputBlockType(block.type)) continue
+
+    const property = blockToJsonSchemaProperty(block)
+    if (!property) continue
+
+    properties[name] = property
+    if (block.required) required.push(name)
+  }
+
+  const schema: FormJsonSchema = {
+    type: 'object',
+    properties,
+    required,
+    additionalProperties: false,
+  }
+
+  const trimmedTitle = title?.trim()
+  const trimmedDescription = description?.trim()
+  if (trimmedTitle) schema.title = trimmedTitle
+  if (trimmedDescription) schema.description = trimmedDescription
+
+  return schema
+}
+
 export function syncFormDefinition(definition: FormSchema): FormSchema {
+  const title = definition.title ?? ''
+  const description = definition.description ?? ''
   return {
-    title: definition.title ?? '',
-    description: definition.description ?? '',
+    title,
+    description,
     blocks: definition.blocks,
-    jsonSchema: definition.jsonSchema ?? {},
+    jsonSchema: blocksToJsonSchema(definition.blocks, title, description),
   }
 }
 
@@ -199,7 +395,7 @@ export function normalizeFormDefinition(raw: FormSchema | undefined): FormSchema
     title: typeof raw.title === 'string' ? raw.title : '',
     description: typeof raw.description === 'string' ? raw.description : '',
     blocks,
-    jsonSchema: normalizeJsonSchema(raw.jsonSchema),
+    jsonSchema: {},
   })
 }
 
@@ -267,7 +463,3 @@ export function createEmptyBlock(type: FormBlockType): FormBlock {
 
   return block
 }
-
-function isOptionsBlockType(type: FormBlockType): boolean {
-  return type === 'select' || type === 'multiselect' || type === 'radio' || type === 'checkbox'
-}

package/src/index.ts

@@ -4,13 +4,17 @@ export type {
   A2uiComponentNode,
   A2uiSurfaceDoc,
   FormBlock,
+  FormBlockCondition,
   FormBlockOption,
   FormBlockType,
+  FormCaseFilter,
+  FormConditionOperator,
   FormDefinitionPayload,
   FormDetailResult,
   FormFilePlaceholderIcon,
   FormJsonSchema,
   FormMediaSize,
+  FormResumeFilter,
   FormSchema,
   SubmitMode,
 } from './types/index'
@@ -18,9 +22,12 @@ export type {
 export {
   A2UI_PROTOCOL_VERSION,
   FORM_MEDIA_SIZES,
+  isDisplayBlockType,
   isInputBlockType,
   isLayoutBlockType,
   isMediaBlockType,
+  isOptionsBlockType,
+  supportsDefaultValue,
 } from './types/index'
 
 export {
@@ -37,7 +44,16 @@ export {
   resolveSurfaceFromFormDefinition,
 } from './adapter/resolveSurface'
 
-export { normalizeFormDefinition, syncFormDefinition } from './adapter/formSchema'
+export {
+  blocksToJsonSchema,
+  coerceToggleValue,
+  createEmptyBlock,
+  createEmptyFormDefinition,
+  normalizeFormDefinition,
+  normalizeMultiselectCount,
+  resolveSchemaDefaultValue,
+  syncFormDefinition,
+} from './adapter/formSchema'
 
 export { extractSurfaceValues } from './adapter/extractSurfaceValues'
 
@@ -144,6 +160,4 @@ export {
   type CaseSearchResult,
 } from './catalog/caseSearchContext'
 
-export type { FormResumeFilter, FormCaseFilter } from './types/index'
-
 import './styles/index.css'

package/src/types/index.ts

@@ -86,9 +86,19 @@ export interface FormBlockOption {
   label: string
 }
 
+export type FormConditionOperator = 'eq' | 'ne' | 'empty' | 'notEmpty'
+
+export interface FormBlockCondition {
+  fieldName: string
+  operator: FormConditionOperator
+  value?: string
+}
+
 /** 简历多选组件：渲染时用于 /univ/resume/search 的筛选条件 */
 export interface FormResumeFilter {
   names?: string[]
+  /** Agent 类型（编辑器辅助，运行时不用） */
+  agentKind?: string
   agentUniqueIds?: string[]
   resumeUniqueIds?: string[]
   pageSize?: number
@@ -127,6 +137,12 @@ export interface FormBlock {
   fileMinCount?: number
   fileMaxCount?: number
   defaultValue?: string | string[] | boolean
+  /** 派生 JSON Schema 时写入 property.$comment */
+  jsonSchemaDescription?: string
+  /** 是否隐藏（仅 text 块；隐藏时仍提交） */
+  hidden?: boolean
+  /** 是否需要 LLM 处理（持久化进 block json） */
+  needLLM?: boolean
   /** 简历多选：是否显示「换一批」 */
   resumeEnableRefresh?: boolean
   /** 简历多选：最少选中数量，配置值 ≥ 1 */
@@ -143,6 +159,7 @@ export interface FormBlock {
   caseMaxCount?: number
   /** 案例单选：列表筛选条件（持久化进 block json） */
   caseFilter?: FormCaseFilter
+  condition?: FormBlockCondition
 }
 
 export interface FormSchema {
@@ -164,6 +181,23 @@ export function isInputBlockType(type: FormBlockType): boolean {
   return !isLayoutBlockType(type) && !isMediaBlockType(type)
 }
 
+export function isDisplayBlockType(type: FormBlockType): boolean {
+  return isLayoutBlockType(type) || isMediaBlockType(type)
+}
+
+export function isOptionsBlockType(type: FormBlockType): boolean {
+  return type === 'select' || type === 'multiselect' || type === 'radio' || type === 'checkbox'
+}
+
+export function supportsDefaultValue(type: FormBlockType): boolean {
+  return (
+    isInputBlockType(type) &&
+    type !== 'file' &&
+    type !== 'resume_multiselect' &&
+    type !== 'case_multiselect'
+  )
+}
+
 export interface FormDefinitionPayload {
   title?: string
   description?: string