@skopon-cool/form-sdk 0.3.0 → 0.3.1

package/dist/runtime/formAutoControl.d.ts

@@ -8,6 +8,7 @@ export interface FormAutoControlTargets {
 }
 export interface FormAutoControlHelpers {
     reportEvent: (event: FormRuntimeEventData) => void;
+    /** 支持同步或返回 Promise（async submit 期间保持 autoControlDepth） */
     runAutoControl: <T>(fn: () => T) => T;
 }
 /** 执行下行 form_auto_control_event；缺参或未知 action 时 warn 并忽略。 */

package/dist/runtime/formAutoControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"formAutoControl.d.ts","sourceRoot":"","sources":["../../src/runtime/formAutoControl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAE7E,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAA;IACpD,SAAS,EAAE,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7D,MAAM,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAClC,yCAAyC;IACzC,WAAW,EAAE,WAAW,GAAG,IAAI,CAAA;CAChC;AAED,MAAM,WAAW,sBAAsB;IACrC,WAAW,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAA;IAClD,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;CACtC;AAiCD,4DAA4D;AAC5D,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,wBAAwB,EAC9B,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,sBAAsB,GAC9B,IAAI,CAyDN"}
+{"version":3,"file":"formAutoControl.d.ts","sourceRoot":"","sources":["../../src/runtime/formAutoControl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAE7E,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAA;IACpD,SAAS,EAAE,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7D,MAAM,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAClC,yCAAyC;IACzC,WAAW,EAAE,WAAW,GAAG,IAAI,CAAA;CAChC;AAED,MAAM,WAAW,sBAAsB;IACrC,WAAW,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAA;IAClD,0DAA0D;IAC1D,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;CACtC;AAiCD,4DAA4D;AAC5D,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,wBAAwB,EAC9B,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,sBAAsB,GAC9B,IAAI,CAyDN"}

package/dist/runtime/formRuntimeContext.d.ts

@@ -4,6 +4,10 @@ import type { FormRuntimeEventData } from './types';
 export interface FormRuntimeContextValue {
     reportEvent: (event: FormRuntimeEventData) => void;
     reportData: (values: Record<string, unknown>) => void;
+    /**
+     * 在自动控上下文中执行 fn。若 fn 返回 Promise，depth 保持到 settle，
+     * 使异步 submit 内的 reportEvent 仍为 form_auto_control_bac_event。
+     */
     runAutoControl: <T>(fn: () => T) => T;
     isAutoControl: () => boolean;
 }

package/dist/runtime/formRuntimeContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"formRuntimeContext.d.ts","sourceRoot":"","sources":["../../src/runtime/formRuntimeContext.tsx"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,SAAS,EACf,MAAM,OAAO,CAAA;AACd,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAC1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAEnD,MAAM,WAAW,uBAAuB;IACtC,WAAW,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAA;IAClD,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAA;IACrD,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;IACrC,aAAa,EAAE,MAAM,OAAO,CAAA;CAC7B;AAqBD,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,mBAAmB,GAAG,IAAI,CAAA;IAClC,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED,wBAAgB,mBAAmB,CAAC,EAClC,MAAM,EACN,QAAQ,GACT,EAAE,wBAAwB,+BAwD1B;AAED,uCAAuC;AACvC,wBAAgB,cAAc,IAAI,uBAAuB,CAExD"}
+{"version":3,"file":"formRuntimeContext.d.ts","sourceRoot":"","sources":["../../src/runtime/formRuntimeContext.tsx"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,SAAS,EACf,MAAM,OAAO,CAAA;AACd,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAC1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAEnD,MAAM,WAAW,uBAAuB;IACtC,WAAW,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAA;IAClD,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAA;IACrD;;;OAGG;IACH,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;IACrC,aAAa,EAAE,MAAM,OAAO,CAAA;CAC7B;AA6BD,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,mBAAmB,GAAG,IAAI,CAAA;IAClC,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED,wBAAgB,mBAAmB,CAAC,EAClC,MAAM,EACN,QAAQ,GACT,EAAE,wBAAwB,+BAkE1B;AAED,uCAAuC;AACvC,wBAAgB,cAAc,IAAI,uBAAuB,CAExD"}

package/package.json

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

package/src/runtime/formAutoControl.test.ts

@@ -5,6 +5,32 @@ import { describe, it, expect, vi } from 'vitest'
 import { executeFormAutoControl } from './formAutoControl'
 import type { FormAutoControlEventData } from './types'
 
+/** 模拟 FormRuntimeProvider.runAutoControl：Promise settle 前保持 depth。 */
+function createDepthTrackingRunAutoControl(depthRef: { current: number }) {
+  return <T,>(fn: () => T): T => {
+    depthRef.current += 1
+    let syncResult: T
+    try {
+      syncResult = fn()
+    } catch (error) {
+      depthRef.current = Math.max(0, depthRef.current - 1)
+      throw error
+    }
+    if (
+      syncResult != null &&
+      (typeof syncResult === 'object' || typeof syncResult === 'function') &&
+      typeof (syncResult as PromiseLike<unknown>).then === 'function'
+    ) {
+      const promise = Promise.resolve(syncResult).finally(() => {
+        depthRef.current = Math.max(0, depthRef.current - 1)
+      })
+      return promise as T
+    }
+    depthRef.current = Math.max(0, depthRef.current - 1)
+    return syncResult
+  }
+}
+
 describe('executeFormAutoControl', () => {
   it('writes values and reports bac change event', () => {
     const setValues = vi.fn()
@@ -68,4 +94,34 @@ describe('executeFormAutoControl', () => {
     )
     expect(submit).toHaveBeenCalled()
   })
+
+  it('keeps autoControl depth until async submit settles', async () => {
+    const depthRef = { current: 0 }
+    const runAutoControl = createDepthTrackingRunAutoControl(depthRef)
+    let resolveSubmit!: () => void
+    const submit = vi.fn(
+      () =>
+        new Promise<void>((resolve) => {
+          resolveSubmit = resolve
+        }),
+    )
+
+    executeFormAutoControl(
+      { action: 'submit' },
+      {
+        setValues: vi.fn(),
+        getValues: () => ({}),
+        submit,
+        rootElement: null,
+      },
+      { reportEvent: vi.fn(), runAutoControl },
+    )
+
+    expect(submit).toHaveBeenCalled()
+    expect(depthRef.current).toBe(1)
+    resolveSubmit()
+    await Promise.resolve()
+    await Promise.resolve()
+    expect(depthRef.current).toBe(0)
+  })
 })

package/src/runtime/formAutoControl.ts

@@ -10,6 +10,7 @@ export interface FormAutoControlTargets {
 
 export interface FormAutoControlHelpers {
   reportEvent: (event: FormRuntimeEventData) => void
+  /** 支持同步或返回 Promise（async submit 期间保持 autoControlDepth） */
   runAutoControl: <T>(fn: () => T) => T
 }
 
@@ -64,8 +65,8 @@ export function executeFormAutoControl(
 
   helpers.runAutoControl(() => {
     if (action === 'submit') {
-      void targets.submit()
-      return
+      // 返回 Promise，使 runAutoControl 在 settle 前保持 depth
+      return targets.submit()
     }
 
     const field = typeof data.field === 'string' ? data.field.trim() : ''

package/src/runtime/formRuntimeContext.tsx

@@ -12,12 +12,24 @@ import type { FormRuntimeEventData } from './types'
 export interface FormRuntimeContextValue {
   reportEvent: (event: FormRuntimeEventData) => void
   reportData: (values: Record<string, unknown>) => void
+  /**
+   * 在自动控上下文中执行 fn。若 fn 返回 Promise，depth 保持到 settle，
+   * 使异步 submit 内的 reportEvent 仍为 form_auto_control_bac_event。
+   */
   runAutoControl: <T>(fn: () => T) => T
   isAutoControl: () => boolean
 }
 
 const FormRuntimeContext = createContext<FormRuntimeContextValue | null>(null)
 
+function isThenable(value: unknown): value is PromiseLike<unknown> {
+  return (
+    value != null &&
+    (typeof value === 'object' || typeof value === 'function') &&
+    typeof (value as PromiseLike<unknown>).then === 'function'
+  )
+}
+
 const noopRuntime: FormRuntimeContextValue = {
   reportEvent: () => {},
   reportData: () => {},
@@ -72,11 +84,21 @@ export function FormRuntimeProvider({
 
   const runAutoControl = useCallback(<T,>(fn: () => T): T => {
     autoControlDepthRef.current += 1
+    let syncResult: T
     try {
-      return fn()
-    } finally {
+      syncResult = fn()
+    } catch (error) {
       autoControlDepthRef.current = Math.max(0, autoControlDepthRef.current - 1)
+      throw error
+    }
+    if (isThenable(syncResult)) {
+      const promise = Promise.resolve(syncResult).finally(() => {
+        autoControlDepthRef.current = Math.max(0, autoControlDepthRef.current - 1)
+      })
+      return promise as T
     }
+    autoControlDepthRef.current = Math.max(0, autoControlDepthRef.current - 1)
+    return syncResult
   }, [])
 
   const isAutoControl = useCallback(