@skopon-cool/form-sdk 0.2.1 → 0.2.2

package/src/client/resumeSearchClient.ts

@@ -0,0 +1,108 @@
+import type { FormResumeFilter } from '../types/index'
+import type { ResumeSearchFn, ResumeSearchItem } from '../catalog/resumeSearchContext'
+import { parseEnvelope } from './apiEnvelope'
+import {
+  type ClientHeadersOptions,
+  resolveClientHeaders,
+} from './authStorage'
+
+export interface ResumeSearchClientOptions extends ClientHeadersOptions {
+  baseUrl?: string
+  searchPath?: string
+  fetch?: typeof fetch
+}
+
+interface ResumeWorkDto {
+  id?: string
+  title?: string
+  link?: string
+  cover_url?: string | null
+}
+
+interface ResumeListItemDto {
+  resume_id: number
+  agent_id: number
+  name: string
+  avatar_url?: string | null
+  description?: string | null
+  satisfaction: number
+  personality_json?: string[]
+  specialties_json?: string[]
+  traits_json?: string[]
+  works_json?: ResumeWorkDto[]
+  published: number
+  works_count: number
+  resume_unique_id: string
+}
+
+interface PagedListDto<T> {
+  list: T[]
+  total: number
+  page: number
+  page_size: number
+}
+
+function mapResumeListItem(dto: ResumeListItemDto): ResumeSearchItem {
+  return {
+    resumeUniqueId: dto.resume_unique_id,
+    resumeId: dto.resume_id,
+    agentId: dto.agent_id,
+    name: dto.name,
+    avatarUrl: dto.avatar_url ?? null,
+    description: dto.description ?? undefined,
+    satisfaction: dto.satisfaction,
+    published: dto.published,
+    worksCount: dto.works_count,
+    personality: dto.personality_json ?? [],
+    specialties: dto.specialties_json ?? [],
+    traits: dto.traits_json ?? [],
+    works: (dto.works_json ?? []).map((work) => ({
+      title: work.title ?? '',
+      coverUrl: work.cover_url ?? null,
+      link: work.link,
+    })),
+  }
+}
+
+function buildResumeSearchQuery(
+  filter: FormResumeFilter,
+  page: number,
+): URLSearchParams {
+  const params = new URLSearchParams()
+  params.set('page', String(page))
+  params.set('page_size', String(filter.pageSize ?? 20))
+  for (const name of filter.names ?? []) {
+    if (name) params.append('name', name)
+  }
+  for (const id of filter.agentUniqueIds ?? []) {
+    if (id) params.append('agent_unique_id', id)
+  }
+  for (const id of filter.resumeUniqueIds ?? []) {
+    if (id) params.append('resume_unique_id', id)
+  }
+  return params
+}
+
+export function createResumeSearchClient(
+  options: ResumeSearchClientOptions = {},
+): ResumeSearchFn {
+  const baseUrl = (options.baseUrl ?? '/api/v1').replace(/\/$/, '')
+  const searchPath = options.searchPath ?? '/univ/resume/search'
+  const fetchFn = options.fetch ?? fetch
+
+  return async ({ filter, page }) => {
+    const headers = await resolveClientHeaders(options)
+    const params = buildResumeSearchQuery(filter, page)
+    const response = await fetchFn(`${baseUrl}${searchPath}?${params.toString()}`, {
+      method: 'GET',
+      headers,
+    })
+    const data = await parseEnvelope<PagedListDto<ResumeListItemDto>>(response)
+    return {
+      list: (data.list ?? []).map(mapResumeListItem),
+      total: data.total ?? 0,
+      page: data.page ?? page,
+      pageSize: data.page_size ?? filter.pageSize ?? 20,
+    }
+  }
+}

package/src/client/skoponSdkClients.ts

@@ -0,0 +1,51 @@
+import { createCaseSearchClient, type CaseSearchClientOptions } from './caseSearchClient'
+import { createFormClient, type FormClient, type FormClientOptions } from './formClient'
+import { createResumeSearchClient, type ResumeSearchClientOptions } from './resumeSearchClient'
+import type { CaseSearchFn } from '../catalog/caseSearchContext'
+import type { ResumeSearchFn } from '../catalog/resumeSearchContext'
+import type { SkoponAuthStorageOptions } from './authStorage'
+
+export interface SkoponSdkClientsOptions {
+  baseUrl?: string
+  fetch?: typeof fetch
+  getHeaders?: () => Record<string, string> | Promise<Record<string, string>>
+  authStorage?: SkoponAuthStorageOptions
+  form?: Pick<FormClientOptions, 'detailPath'>
+  resume?: Pick<ResumeSearchClientOptions, 'searchPath'>
+  case?: Pick<CaseSearchClientOptions, 'listPath' | 'published'>
+}
+
+export interface SkoponSdkClients {
+  fetchDetail: FormClient['fetchDetail']
+  resumeSearch: ResumeSearchFn
+  caseSearch: CaseSearchFn
+}
+
+export function createSkoponSdkClients(
+  options: SkoponSdkClientsOptions = {},
+): SkoponSdkClients {
+  const shared = {
+    baseUrl: options.baseUrl,
+    fetch: options.fetch,
+    getHeaders: options.getHeaders,
+    authStorage: options.authStorage,
+  }
+
+  const formClient = createFormClient({
+    ...shared,
+    detailPath: options.form?.detailPath,
+  })
+
+  return {
+    fetchDetail: formClient.fetchDetail,
+    resumeSearch: createResumeSearchClient({
+      ...shared,
+      searchPath: options.resume?.searchPath,
+    }),
+    caseSearch: createCaseSearchClient({
+      ...shared,
+      listPath: options.case?.listPath,
+      published: options.case?.published,
+    }),
+  }
+}

package/src/components/AskUserFormCard.tsx

@@ -12,6 +12,7 @@ import {
   payloadHasInputBlocks,
 } from '../submit/intersectPayloadBlocksWithForm'
 import { copyTextToClipboard, submitFormJson } from '../submit/submitFormJson'
+import { validateFormSubmitValues } from '../submit/validateFormSubmit'
 import type { CaseSearchFn } from '../catalog/caseSearchContext'
 import type { ResumeSearchFn } from '../catalog/resumeSearchContext'
 import SkoponFormRenderer, { type SkoponFormRendererRef } from './SkoponFormRenderer'
@@ -182,6 +183,11 @@ export default function AskUserFormCard({
     setSubmitting(true)
     try {
       const cardValues = rendererRef.current?.getValues(fieldNames) ?? {}
+      const validationError = validateFormSubmitValues(renderBlocks, cardValues)
+      if (validationError) {
+        onNotifyRef.current?.('error', validationError.message)
+        return
+      }
       const submitBody = { ...cardValues, ...extraValues }
 
       if (submitMode === 'post') {

package/src/index.ts

@@ -65,6 +65,27 @@ export {
 } from './submit/submitFormJson'
 
 export { createFormClient, type FormClient, type FormClientOptions } from './client/formClient'
+export {
+  resolveSkoponAuthHeaders,
+  resolveClientHeaders,
+  DEFAULT_AUTH_STORAGE_KEY,
+  DEFAULT_AUTH_TOKEN_FIELD,
+  type SkoponAuthStorageOptions,
+  type ClientHeadersOptions,
+} from './client/authStorage'
+export {
+  createResumeSearchClient,
+  type ResumeSearchClientOptions,
+} from './client/resumeSearchClient'
+export {
+  createCaseSearchClient,
+  type CaseSearchClientOptions,
+} from './client/caseSearchClient'
+export {
+  createSkoponSdkClients,
+  type SkoponSdkClients,
+  type SkoponSdkClientsOptions,
+} from './client/skoponSdkClients'
 
 export { default as SkoponFormRenderer } from './components/SkoponFormRenderer'
 export type { SkoponFormRendererProps, SkoponFormRendererRef } from './components/SkoponFormRenderer'

package/src/submit/submit.test.ts

@@ -17,6 +17,7 @@ import {
   payloadHasInputBlocks,
 } from '../submit/intersectPayloadBlocksWithForm'
 import { submitFormJson } from '../submit/submitFormJson'
+import { validateFormSubmitValues } from '../submit/validateFormSubmit'
 import type { FormSchema } from '../types/index'
 
 describe('buildCurlStatement', () => {
@@ -284,3 +285,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/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":""}