@picked/svelte 0.0.1-dev.1767653321515 → 0.0.1-dev.1767653665615

package/dist/form/form.svelte.d.ts

@@ -7,6 +7,7 @@ interface GetFormOptions {
     fields: Store<Field[] | FieldWithValue[]>;
 }
 type SuccessCallback = (options: {
+    data: CommitResponses;
     stopNavigation: EventCallable<void>;
 }) => void | Promise<void>;
 type ErrorCallback = (errors: ValidationError[]) => void | Promise<void>;

package/dist/form/form.svelte.ts

@@ -29,7 +29,15 @@ interface GetFormOptions {
   fields: Store<Field[] | FieldWithValue[]>
 }
 
-type SuccessCallback = (options: { stopNavigation: EventCallable<void> }) => void | Promise<void>
+interface CommitResult {
+  data: CommitResponses
+  errors: ValidationError[]
+}
+
+type SuccessCallback = (options: {
+  data: CommitResponses
+  stopNavigation: EventCallable<void>
+}) => void | Promise<void>
 type ErrorCallback = (errors: ValidationError[]) => void | Promise<void>
 type SubmitCallback = (
   data: CommitResponses,
@@ -41,12 +49,12 @@ type SubmitEventWithCurrentTarget = SubmitEvent & { currentTarget: EventTarget &
  * Factory function to create a callback observer with automatic cleanup
  * Reduces duplication across success/error/submit callback patterns
  */
-function createObserver<TCallback extends (...args: any[]) => any>(
-  executor: (callbacks: TCallback[], ...params: Parameters<TCallback>) => Promise<any>,
+function createObserver<TCallback extends (...args: any[]) => any, TReturn = void>(
+  executor: (callbacks: TCallback[], ...params: Parameters<TCallback>) => Promise<TReturn>,
 ) {
   let callbacks: TCallback[] = []
 
-  const executeFx = createEffect(async (...params: Parameters<TCallback>) => {
+  const executeFx = createEffect(async (...params: Parameters<TCallback>): Promise<TReturn> => {
     return await executor(callbacks, ...params)
   })
 
@@ -68,7 +76,7 @@ export function getForm({ id: formId, title, fields }: GetFormOptions) {
   const { currentStepStore: stepStore, goToNextStep } = experienceInstance
 
   const submitEvent = createEvent<SubmitEventWithCurrentTarget>()
-  const formSuccessEvent = createEvent<void>()
+  const formSuccessEvent = createEvent<CommitResponses>()
   const formErrorEvent = createEvent<ValidationError[]>()
   const stopNavigationEvent = createEvent<void>()
   const allCallbacksCompleteEvent = createEvent<void>()
@@ -88,40 +96,56 @@ export function getForm({ id: formId, title, fields }: GetFormOptions) {
     await Promise.all(callbacks.map((callback) => Promise.resolve(callback(errors))))
   })
 
-  const submitObserver = createObserver<SubmitCallback>(async (callbacks, data) => {
-    let transformedData = data
+  const submitObserver = createObserver<SubmitCallback, CommitResponses>(
+    async (callbacks, data) => {
+      let transformedData = data
 
-    // Apply each callback's transformation sequentially
-    for (const callback of callbacks) {
-      const result = await Promise.resolve(callback(transformedData))
-      // If callback returns data, use it; otherwise keep current
-      if (result !== undefined) {
-        transformedData = result
+      // Apply each callback's transformation sequentially
+      for (const callback of callbacks) {
+        const result = await Promise.resolve(callback(transformedData))
+        // If callback returns data, use it; otherwise keep current
+        if (result !== undefined) {
+          transformedData = result
+        }
       }
-    }
 
-    return transformedData
+      return transformedData
+    },
+  )
+
+  const commitFx = createEffect(async (responses: CommitResponses) => {
+    const result = await client.responses.commit(responses)
+    // Merge submitted data with validation result
+    return {
+      data: responses,
+      errors: result.errors,
+    }
   })
 
-  const commitFx = createEffect((responses: CommitResponses) => client.responses.commit(responses))
-
   const onSuccessFx = attach({
     source: { step: stepStore },
-    effect: createEffect(async ({ step }: { step: ExperienceStep | null }) => {
-      client.eventBus({
-        type: 'form_submit_success',
-        form: { id: formId, title },
-        experience: experienceInstance,
-        step: step ?? undefined,
-      })
+    mapParams: (commitResult: CommitResult, source) => ({
+      step: source.step,
+      data: commitResult.data,
     }),
+    effect: createEffect(
+      async ({ step, data }: { step: ExperienceStep | null; data: CommitResponses }) => {
+        client.eventBus({
+          type: 'form_submit_success',
+          form: { id: formId, title },
+          experience: experienceInstance,
+          step: step ?? undefined,
+        })
+        return data
+      },
+    ),
   })
 
   const onErrorFx = attach({
     source: { step: stepStore },
-    mapParams: (params: { errors: ValidationError[] }, source) => ({
+    mapParams: (commitResult: CommitResult, source) => ({
       step: source.step,
-      errors: params.errors,
+      errors: commitResult.errors,
     }),
     effect: createEffect(
       async ({ step, errors }: { step: ExperienceStep | null; errors: ValidationError[] }) => {
@@ -300,14 +324,14 @@ export function getForm({ id: formId, title, fields }: GetFormOptions) {
   })
 
   sample({
-    clock: onSuccessFx.done,
+    clock: onSuccessFx.doneData,
     target: formSuccessEvent,
   })
 
   // When form succeeds, execute all callbacks
   sample({
     clock: formSuccessEvent,
-    fn: () => ({ stopNavigation: stopNavigationEvent }), // Pass event reference to callbacks (not calling it)
+    fn: (data) => ({ data, stopNavigation: stopNavigationEvent }), // Pass form data and event reference to callbacks
     target: successObserver.executeFx,
   })
 

package/dist/hooks/step.d.ts

@@ -18,6 +18,7 @@ export declare function getStep(): {
     };
     onFormSubmit: (callback: (data: import('@picked/client').CommitResponses) => import('@picked/client').CommitResponses | void | Promise<import('@picked/client').CommitResponses | void>) => void;
     onFormSuccess: (callback: (options: {
+        data: import('@picked/client').CommitResponses;
         stopNavigation: import('effector').EventCallable<void>;
     }) => void | Promise<void>) => void;
     onFormError: (callback: (errors: import('@picked/client').ValidationError[]) => void | Promise<void>) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@picked/svelte",
-  "version": "0.0.1-dev.1767653321515",
+  "version": "0.0.1-dev.1767653665615",
   "dependencies": {
     "d3": "^7.9.0"
   },
@@ -75,7 +75,7 @@
   ],
   "module": "./dist/index.js",
   "peerDependencies": {
-    "@picked/client": "0.0.1-dev.1767653321515",
+    "@picked/client": "0.0.1-dev.1767653665615",
     "effector": "^23.3.0",
     "svelte": "^5.34.3"
   },