@skopon-cool/form-sdk 0.2.1 → 0.2.3

package/src/submit/submit.test.ts

@@ -8,6 +8,7 @@ import {
   buildAskUserSubmitCurlFromPayload,
   buildCurlStatement,
 } from '../submit/buildCurlStatement'
+import { buildAnswerAgentBody } from '../submit/buildAnswerAgentBody'
 import {
   extractExtraBlockValues,
   getPayloadInputFieldNames,
@@ -16,7 +17,9 @@ import {
   parsePayloadBlocksJson,
   payloadHasInputBlocks,
 } from '../submit/intersectPayloadBlocksWithForm'
+import { submitAnswerAgent } from '../submit/submitAnswerAgent'
 import { submitFormJson } from '../submit/submitFormJson'
+import { validateFormSubmitValues } from '../submit/validateFormSubmit'
 import type { FormSchema } from '../types/index'
 
 describe('buildCurlStatement', () => {
@@ -260,6 +263,79 @@ describe('payload fallback helpers', () => {
   })
 })
 
+describe('buildAnswerAgentBody', () => {
+  it('maps context and payload into answer-agent body', () => {
+    const payload = {
+      title: '需求描述',
+      blocks: [
+        { id: 'b1', type: 'textarea', name: 'field_b6ba0dbb', label: '需求描述' },
+      ],
+    }
+    const body = buildAnswerAgentBody({
+      context: {
+        missionId: 12,
+        tenantId: 1001,
+        tenantUserId: 'user-1',
+        requestId: 'req-1',
+        askUserQueryDescription: '请确认',
+        callbackUrl: 'https://example.com/cb',
+      },
+      payload,
+      answer: { field_b6ba0dbb: 'hello' },
+    })
+    expect(body.mission_id).toBe(12)
+    expect(body.tenant_id).toBe(1001)
+    expect(body.tenant_user_id).toBe('user-1')
+    expect(body.request_id).toBe('req-1')
+    expect(body.ask_user_query_description).toBe('请确认')
+    expect(body.callback_url).toBe('https://example.com/cb')
+    expect(body.answer).toEqual({ field_b6ba0dbb: 'hello' })
+    expect(body.question).toMatchObject({ title: '需求描述' })
+    expect(body.form).toMatchObject({ title: '需求描述' })
+    expect((body.question as { blocks: Array<{ name: string }> }).blocks[0]?.name).toBe(
+      'field_b6ba0dbb',
+    )
+  })
+})
+
+describe('submitAnswerAgent', () => {
+  it('POSTs to explicit answer agent callback url with auth headers', async () => {
+    const fetchMock = vi.fn(async () => ({
+      ok: true,
+      status: 200,
+      headers: { get: () => 'application/json' },
+      json: async () => ({ callback_ok: true }),
+    })) as unknown as typeof fetch
+
+    const result = await submitAnswerAgent(
+      { answer: { a: 1 } },
+      {
+        answerAgentCallbackUrl: '/api/v1/mock/ask_user_answer_mock',
+        headers: { Authorization: 'Bearer tok' },
+        fetch: fetchMock,
+      },
+    )
+    expect(result.ok).toBe(true)
+    expect(fetchMock).toHaveBeenCalledWith(
+      '/api/v1/mock/ask_user_answer_mock',
+      expect.objectContaining({
+        method: 'POST',
+        headers: expect.objectContaining({
+          Authorization: 'Bearer tok',
+          'Content-Type': 'application/json',
+        }),
+        body: JSON.stringify({ answer: { a: 1 } }),
+      }),
+    )
+  })
+
+  it('throws when answer agent callback url is missing', async () => {
+    await expect(submitAnswerAgent({ answer: {} })).rejects.toThrow(
+      'answer_agent_callback_url 未配置，无法提交',
+    )
+  })
+})
+
 describe('submitFormJson', () => {
   it('POSTs JSON payload', async () => {
     const fetchMock = vi.fn(async () => ({
@@ -284,3 +360,42 @@ describe('submitFormJson', () => {
     )
   })
 })
+
+describe('validateFormSubmitValues', () => {
+  it('rejects empty required text field', () => {
+    const blocks = [
+      { id: 'b1', type: 'text' as const, name: 'title', label: '标题', required: true },
+    ]
+    expect(validateFormSubmitValues(blocks, { title: '' })?.message).toBe('请填写「标题」')
+    expect(validateFormSubmitValues(blocks, { title: 'ok' })).toBeNull()
+  })
+
+  it('rejects invalid email format', () => {
+    const blocks = [
+      { id: 'b1', type: 'email' as const, name: 'email', label: '邮箱' },
+    ]
+    expect(validateFormSubmitValues(blocks, { email: 'bad' })?.message).toBe('「邮箱」格式不正确')
+    expect(validateFormSubmitValues(blocks, { email: 'a@b.co' })).toBeNull()
+  })
+
+  it('enforces resume and case minCount when required or partially filled', () => {
+    const resumeBlocks = [
+      {
+        id: 'b1',
+        type: 'resume_multiselect' as const,
+        name: 'resumes',
+        label: '简历',
+        resumeMinCount: 2,
+      },
+    ]
+    expect(validateFormSubmitValues(resumeBlocks, { resumes: [] })).toBeNull()
+    expect(validateFormSubmitValues(resumeBlocks, { resumes: ['r1'] })?.message).toBe(
+      '「简历」至少选择 2 项',
+    )
+
+    const requiredResume = [{ ...resumeBlocks[0]!, required: true }]
+    expect(validateFormSubmitValues(requiredResume, { resumes: [] })?.message).toBe(
+      '请填写「简历」',
+    )
+  })
+})

package/src/submit/submitAnswerAgent.ts

@@ -0,0 +1,39 @@
+import {
+  resolveAnswerAgentCallbackUrl,
+  resolveSkoponAuthHeaders,
+  type SkoponAuthStorageOptions,
+} from '../client/authStorage'
+import {
+  submitFormJson,
+  type SubmitFormJsonOptions,
+  type SubmitFormJsonResult,
+} from './submitFormJson'
+
+export interface SubmitAnswerAgentOptions extends SubmitFormJsonOptions {
+  authStorage?: SkoponAuthStorageOptions
+  /** 显式覆盖 auth_user 中的 answer_agent_callback_url */
+  answerAgentCallbackUrl?: string | null
+}
+
+export async function submitAnswerAgent(
+  body: Record<string, unknown>,
+  options?: SubmitAnswerAgentOptions,
+): Promise<SubmitFormJsonResult> {
+  const url = (
+    options?.answerAgentCallbackUrl ??
+    resolveAnswerAgentCallbackUrl(options?.authStorage)
+  ).trim()
+  if (!url) {
+    throw new Error('answer_agent_callback_url 未配置，无法提交')
+  }
+
+  const storageHeaders = resolveSkoponAuthHeaders(options?.authStorage)
+
+  return submitFormJson(url, body, {
+    ...options,
+    headers: {
+      ...storageHeaders,
+      ...(options?.headers ?? {}),
+    },
+  })
+}

package/src/submit/validateFormSubmit.ts

@@ -0,0 +1,111 @@
+import type { FormBlock } from '../types/index'
+import { isLayoutBlockType, isMediaBlockType } from '../types/index'
+import { EMAIL_REGEXP } from '../adapter/a2uiAdapter'
+import { coerceToggleValue } from '../adapter/formSchema'
+import { asStringArray } from '../catalog/useSkoponBoundField'
+
+export interface FormSubmitValidationError {
+  fieldName: string
+  label: string
+  message: string
+}
+
+export function matchesValidationRegexp(value: string, pattern: string): boolean {
+  if (!pattern.trim()) return true
+  try {
+    return new RegExp(pattern).test(value)
+  } catch {
+    return true
+  }
+}
+
+function isBlankString(raw: unknown): boolean {
+  if (raw === undefined || raw === null) return true
+  if (typeof raw === 'string') return !raw.trim()
+  return false
+}
+
+function isEmptySubmitValue(block: FormBlock, raw: unknown): boolean {
+  switch (block.type) {
+    case 'multiselect':
+    case 'checkbox':
+    case 'file':
+    case 'resume_multiselect':
+    case 'case_multiselect':
+      return asStringArray(raw).length === 0
+    case 'toggle':
+      return !coerceToggleValue(raw)
+    case 'number':
+      return raw === undefined || raw === null || raw === ''
+    default:
+      return isBlankString(raw)
+  }
+}
+
+function shouldEnforceMinCount(block: FormBlock, count: number): boolean {
+  return block.required === true || count > 0
+}
+
+/** 提交前校验 renderBlocks 对应字段值；首个错误即返回。 */
+export function validateFormSubmitValues(
+  blocks: FormBlock[],
+  values: Record<string, unknown>,
+): FormSubmitValidationError | null {
+  for (const block of blocks) {
+    const name = block.name?.trim()
+    if (!name) continue
+    if (isLayoutBlockType(block.type) || isMediaBlockType(block.type)) continue
+
+    const raw = values[name]
+    const label = block.label?.trim() || name
+
+    if (block.required && isEmptySubmitValue(block, raw)) {
+      return { fieldName: name, label, message: `请填写「${label}」` }
+    }
+
+    if (block.type === 'email' && !isBlankString(raw)) {
+      const text = String(raw).trim()
+      if (!matchesValidationRegexp(text, EMAIL_REGEXP)) {
+        return { fieldName: name, label, message: `「${label}」格式不正确` }
+      }
+    }
+
+    if (block.type === 'file') {
+      const min = block.fileMinCount ?? 0
+      const count = asStringArray(raw).length
+      if (min > 0 && count < min && shouldEnforceMinCount(block, count)) {
+        return {
+          fieldName: name,
+          label,
+          message: `「${label}」至少需要 ${min} 个文件`,
+        }
+      }
+    }
+
+    if (block.type === 'resume_multiselect') {
+      const min = block.resumeMinCount
+      const count = asStringArray(raw).length
+      if (min !== undefined && count < min && shouldEnforceMinCount(block, count)) {
+        return {
+          fieldName: name,
+          label,
+          message: `「${label}」至少选择 ${min} 项`,
+        }
+      }
+    }
+
+    if (block.type === 'case_multiselect') {
+      const min = block.caseMinCount
+      const count = asStringArray(raw).length
+      if (min !== undefined && count < min && shouldEnforceMinCount(block, count)) {
+        return {
+          fieldName: name,
+          label,
+          message: `「${label}」至少选择 ${min} 项`,
+        }
+      }
+    }
+  }
+
+  return null
+}

package/dist/catalog/skoponSelectLoading.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=skoponSelectLoading.test.d.ts.map

package/dist/catalog/skoponSelectLoading.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"skoponSelectLoading.test.d.ts","sourceRoot":"","sources":["../../src/catalog/skoponSelectLoading.test.tsx"],"names":[],"mappings":""}

package/dist/catalog/textFieldPreview.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=textFieldPreview.test.d.ts.map

package/dist/catalog/textFieldPreview.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"textFieldPreview.test.d.ts","sourceRoot":"","sources":["../../src/catalog/textFieldPreview.test.tsx"],"names":[],"mappings":""}

package/dist/components/SkoponA2uiStreamRenderer.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=SkoponA2uiStreamRenderer.test.d.ts.map

package/dist/components/SkoponA2uiStreamRenderer.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"SkoponA2uiStreamRenderer.test.d.ts","sourceRoot":"","sources":["../../src/components/SkoponA2uiStreamRenderer.test.tsx"],"names":[],"mappings":""}