@picked/svelte 0.0.1-dev.1772165084341 → 0.0.1-dev.1772412203098

package/dist/form/build-responses.d.ts

@@ -0,0 +1,13 @@
+import { FieldBase, FieldValue } from '@picked/client';
+type FieldLike = Pick<FieldBase, 'id' | 'type' | 'multiple'>;
+/**
+ * Parses a FormData snapshot into a typed record of field responses.
+ *
+ * - Fields absent from FormData are mapped to `null`.
+ * - Empty string values are mapped to `null`.
+ * - Repeated entries for the same field (e.g. multi-select checkboxes) are
+ *   merged into a typed array — matching the field's declared element type.
+ * - Values are coerced to the field's declared type (text → string, number → number, boolean → boolean).
+ */
+export declare function buildResponsesFromFormData(fields: FieldLike[], formData: FormData): Record<string, FieldValue>;
+export {};

package/dist/form/build-responses.js

@@ -0,0 +1 @@
+function i(e,o,n){const r=e[o];if(r===void 0){e[o]=n;return}if(Array.isArray(r)&&Array.isArray(n)&&n.length>0){typeof r[0]=="string"?e[o]=[...r,...n].map(String):typeof r[0]=="number"?e[o]=[...r,...n].map(Number):typeof r[0]=="boolean"?e[o]=[...r,...n].map(t=>!!t):e[o]=n;return}e[o]=n}function b(e,o){const n=Array.from(o.entries()),r={};return e.forEach(t=>{let m=n.filter(([s])=>s===t.id);m.length===0&&(m=[[t.id,""]]),m.forEach(([,s])=>{if(s===""){i(r,t.id,null);return}switch(t.type){case"text":case"object":i(r,t.id,t.multiple?[String(s)]:String(s));break;case"number":i(r,t.id,t.multiple?[Number(s)]:Number(s));break;case"boolean":i(r,t.id,t.multiple?[s==="true"]:s==="true");break}})}),r}export{b as buildResponsesFromFormData};

package/dist/form/create-field-evaluator.d.ts

@@ -0,0 +1,17 @@
+import { FieldValue, FieldWithStatus, Picked } from '@picked/client';
+import { Store, StoreWritable } from 'effector';
+/**
+ * Creates a reactive store of evaluated fields for a given set of field IDs.
+ *
+ * Fields are re-evaluated whenever:
+ * - The available field IDs change (e.g. a step is entered)
+ * - Any response is committed (options may depend on prior answers)
+ * - The global field registry changes (fields registered after init)
+ * - Staged values change (field visibility conditions may reference responses.*)
+ *
+ * Evaluation runs `getStepFields` with effective responses (committed + staged) as context,
+ * so visibility conditions see live in-session values rather than only committed responses.
+ */
+export declare function createFieldEvaluator(client: Picked, fieldIds: Store<string[]>, stagedValuesStore: StoreWritable<Record<string, FieldValue>>): {
+    fieldsStore: Store<FieldWithStatus[]>;
+};

package/dist/form/create-field-evaluator.js

@@ -0,0 +1 @@
+import{getStepFields as m}from"@picked/client";import{createStore as u,attach as F,createEffect as S,sample as i}from"effector";function k(e,r,s){const o=u([]),t=F({source:{allFields:e.fields.listStore,fieldIds:r,staged:s,committed:e.responses.getAllStore},effect:S(async({allFields:l,fieldIds:a,staged:c,committed:d})=>{const f=l.filter(p=>a.includes(p.id)),n={...d,...c};return await m(e,f,{responses:n})})});return i({clock:t.doneData,target:o}),t(),i({clock:[e.responses.listStore,r,e.fields.listStore,s],target:t}),{fieldsStore:o}}export{k as createFieldEvaluator};

package/dist/form/create-field-validation.d.ts

@@ -0,0 +1,41 @@
+import { FieldValue, FieldWithStatus, Picked, ValidationError } from '@picked/client';
+import { EventCallable, Store, StoreWritable } from 'effector';
+export interface FieldValidation {
+    /** Dispatch when a field value changes — runs validation if the field has been touched. */
+    fieldChangeEvent: EventCallable<{
+        fieldId: string;
+        value: FieldValue;
+    }>;
+    /** Dispatch when a field loses focus — always runs full validation including required check. */
+    fieldBlurEvent: EventCallable<{
+        fieldId: string;
+        value: FieldValue;
+    }>;
+    /** Which fields have been interacted with — used by formFieldsStore to show/hide errors. */
+    touchedStore: StoreWritable<Partial<Record<string, boolean>>>;
+    /**
+     * Per-field validation errors — written by client-side validation and overwritten
+     * by server errors on commit failure. Exposed as writable so the submit pipeline
+     * can populate server errors and reset state on new submit attempts.
+     */
+    fieldErrorsStore: StoreWritable<Partial<Record<string, ValidationError>>>;
+    /** Flat list of all current validation errors — derived from fieldErrorsStore. */
+    formErrorsStore: Store<ValidationError[]>;
+    /**
+     * Current in-session field values — updated on every onChange/onBlur before commit.
+     * Used as the responses context for condition evaluation so conditions react to
+     * live input without writing to client.responses prematurely.
+     */
+    stagedValuesStore: StoreWritable<Record<string, FieldValue>>;
+}
+/**
+ * Creates the client-side validation slice for a form.
+ *
+ * Responsibilities:
+ * - Tracks which fields have been touched (first blur = touched)
+ * - Validates on blur (full: includes required check) and on change (if already touched)
+ * - Uses the same json-logic evaluator the server uses, so client and server results match
+ * - Maintains stagedValuesStore: current in-session values used as responses context for
+ *   condition evaluation, avoiding premature writes to client.responses
+ */
+export declare function createFieldValidation(client: Picked, fieldsStore: Store<FieldWithStatus[]>, stagedValuesStore: StoreWritable<Record<string, FieldValue>>): FieldValidation;

package/dist/form/create-field-validation.js

@@ -0,0 +1 @@
+import{evaluateRuleLogic as M}from"@picked/client";import{createEvent as h,createStore as y,sample as p,attach as q}from"effector";function F(s){return s===null||s===""||Array.isArray(s)&&s.length===0}function R(s,k,c){const f=h(),a=h(),u=y({});p({clock:a,source:u,fn:(r,{fieldId:e})=>({...r,[e]:!0}),target:u});const g=y({}),v=g.map(r=>Object.values(r).filter(e=>e!==void 0)),m=q({source:{fields:k,staged:c,committed:s.responses.getAllStore},effect:async({fields:r,staged:e,committed:n},{fieldId:t,value:i,checkRequired:E})=>{const o=r.find(d=>d.id===t);if(!o)return{fieldId:t,error:null};if(o.validation&&Object.keys(o.validation).length>0){const d={...n,...e},l=await M(s,o.validation,{responses:d,$input:i});if(typeof l=="string")return{fieldId:t,error:{fieldId:t,userMessage:l,systemMessage:l,value:i}};if(l===!1)return{fieldId:t,error:{fieldId:t,userMessage:"This field is invalid",systemMessage:"Field validation rule returned false.",value:i}}}return E&&o.required&&F(i)?{fieldId:t,error:{fieldId:t,userMessage:"This field is required",systemMessage:"Field is required.",value:i}}:{fieldId:t,error:null}}});return p({clock:f,source:u,filter:(r,{fieldId:e})=>r[e]===!0,fn:(r,{fieldId:e,value:n})=>({fieldId:e,value:n,checkRequired:!1}),target:m}),p({clock:a,fn:({fieldId:r,value:e})=>({fieldId:r,value:e,checkRequired:!0}),target:m}),c.on(f,(r,{fieldId:e,value:n})=>({...r,[e]:n})),c.on(a,(r,{fieldId:e,value:n})=>({...r,[e]:n})),g.on(m.doneData,(r,{fieldId:e,error:n})=>{if(n===null){const t={...r};return delete t[e],t}return{...r,[e]:n}}),{fieldChangeEvent:f,fieldBlurEvent:a,touchedStore:u,fieldErrorsStore:g,formErrorsStore:v,stagedValuesStore:c}}export{R as createFieldValidation};

package/dist/form/create-form.js

@@ -0,0 +1 @@
+import"svelte/internal/client";import{createStore as C,combine as P,attach as j,sample as u}from"effector";import{getPicked as N,getExperience as R}from"../hooks/client.js";import{createFieldEvaluator as W}from"./create-field-evaluator.js";import{createFieldValidation as q}from"./create-field-validation.js";import{createSubmitPipeline as w}from"./create-submit-pipeline.svelte";function x(m){const t=m.currentTarget;if(t instanceof HTMLInputElement)return t.type==="checkbox"?t.checked:t.value;if(t instanceof HTMLSelectElement||t instanceof HTMLTextAreaElement)return t.value}function X(m,t,k){const r=N(),g=R(),{currentStepStore:F,goToNextStep:I}=g,d=C({}),{fieldsStore:a}=W(r,k,d),{fieldChangeEvent:E,fieldBlurEvent:T,touchedStore:b,fieldErrorsStore:p,formErrorsStore:A}=q(r,a,d),y=P({fields:a,responses:r.responses.listStore,staged:d,fieldErrors:p,touched:b},({fields:s,responses:o,staged:i,fieldErrors:S,touched:f})=>s.map(e=>({...e,value:i[e.id]??o.find(n=>n.fieldId===e.id)?.value,error:S[e.id],touched:f[e.id]??!1,onChange:n=>{const c=x(n);c!==void 0&&E({fieldId:e.id,value:c})},onBlur:n=>{const c=x(n);c!==void 0&&T({fieldId:e.id,value:c})}}))),D=j({source:{staged:d,committed:r.responses.getAllStore,allFields:r.fields.listStore},effect:({staged:s,committed:o,allFields:i},S)=>{const f={...o,...s};for(const e of S){const n=i.find(v=>v.id===e);if(!n)continue;(n.dependsOn??[]).every(v=>{const l=f[v];return l!=null&&l!==""&&!(Array.isArray(l)&&l.length===0)})?r.fields.resolveAll([e],{force:!0,context:{responses:f}}):r.fields.setWaiting(e)}}});u({clock:E,source:{fields:a},fn:({fields:s},{fieldId:o})=>s.filter(i=>i.dependsOn?.includes(o)).map(i=>i.id),target:D});const{submitEvent:H,isFormSubmitting:L,onSubmit:M,onSuccess:O,onError:V,submitStarted:h,serverErrorsReceived:B}=w({client:r,experienceInstance:g,formId:m,title:t,stepStore:F,fieldsStore:a,goToNextStep:I});return u({clock:h,fn:()=>({}),target:b}),u({clock:h,fn:()=>({}),target:p}),u({clock:B,fn:s=>Object.fromEntries(s.map(o=>[o.fieldId,o])),target:p}),{form:{onsubmit:H,errors:A,submitting:L,onSubmit:M,onSuccess:O,onError:V},fields:y}}export{X as createForm};

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

@@ -0,0 +1,41 @@
+import { FieldValue, FieldWithStatus, ValidationError } from '@picked/client';
+import { EventCallable, Store } from 'effector';
+import { ErrorCallback, SubmitCallback, SubmitEventWithCurrentTarget, SuccessCallback } from './create-submit-pipeline.svelte';
+export type FormField = Omit<FieldWithStatus, 'error'> & {
+    value: FieldValue | undefined;
+    /** Validation error for this field, or undefined if valid. */
+    error: ValidationError | undefined;
+    touched: boolean;
+    onChange: (e: Event) => void;
+    onBlur: (e: Event) => void;
+};
+/**
+ * Return type for createForm()
+ * Provides form handlers, reactive stores, and callback registration
+ */
+export interface FormInstance<TFieldIds extends string = string> {
+    /** Form element props (bind to <form>) */
+    form: {
+        onsubmit: EventCallable<SubmitEventWithCurrentTarget>;
+        /** Flat list of all current validation errors — derived from fieldErrors */
+        errors: Store<ValidationError[]>;
+        /** Reactive store indicating if form is currently submitting */
+        submitting: Store<boolean>;
+        /** Register callbacks to transform/validate data before submission */
+        onSubmit: (callback: SubmitCallback<TFieldIds>) => void;
+        /** Register callbacks to run on successful form submission */
+        onSuccess: (callback: SuccessCallback<TFieldIds>) => void;
+        /** Register callbacks to run on form validation errors */
+        onError: (callback: ErrorCallback) => void;
+    };
+    /** Reactive store of fields with current values, errors, touched state, and event handlers */
+    fields: Store<FormField[]>;
+}
+/**
+ * Creates a form instance tied to a set of field IDs.
+ * Handles field evaluation, form submission, data transformation,
+ * validation, event bus tracking, and step navigation.
+ *
+ * Used internally by setStepContext — access via getStep() in components.
+ */
+export declare function createForm(formId: string, title: Store<string>, fieldIds: Store<string[]>): FormInstance;

package/dist/form/create-form.svelte.js

@@ -0,0 +1 @@
+export * from './create-form.js';

package/dist/form/create-submit-pipeline.js

@@ -0,0 +1 @@
+import*as C from"svelte/internal/client";import{createEvent as i,createStore as B,createEffect as l,attach as O,sample as s,split as R}from"effector";import{buildResponsesFromFormData as T}from"./build-responses.js";function k(c){let o=[];return{executeFx:l(async(...a)=>await c(o,...a)),register:a=>{const f=()=>{o=o.filter(p=>p!==a)};C.user_effect(()=>(o.push(a),f))}}}function q({client:c,experienceInstance:o,formId:u,title:m,stepStore:a,fieldsStore:f,goToNextStep:p}){const n=i(),y=i(),v=i(),_=i(),x=i(),d=B(!1),D=B(!1);D.on(_,()=>!0).on(n,()=>!1);const N=n.map(()=>{}),g=k(async(e,t)=>{await Promise.all(e.map(r=>Promise.resolve(r(t))))}),b=k(async(e,t)=>{await Promise.all(e.map(r=>Promise.resolve(r(t))))}),F=k(async(e,t)=>{let r=t;for(const E of e){const w=await Promise.resolve(E(r));w!==void 0&&(r=w)}return r}),P=l(async e=>{const t=await c.responses.commit(e);return{data:e,errors:t.errors}}),h=O({source:{step:a,title:m},mapParams:(e,t)=>({step:t.step,title:t.title,data:e.data}),effect:l(async({step:e,title:t,data:r})=>(c.eventBus({type:"form_submit_success",form:{id:u,title:t},experience:o,step:e??void 0}),r))}),S=O({source:{step:a,title:m},mapParams:(e,t)=>({step:t.step,title:t.title,errors:e.errors}),effect:l(async({step:e,title:t,errors:r})=>(c.eventBus({type:"form_submit_error",form:{id:u,title:t},exception:{reason:r},experience:o,step:e??void 0}),r.forEach(E=>{c.eventBus({type:"field_validation_error",exception:{reason:[E]},experience:o,step:e??void 0})}),r))});return s({clock:n,fn:()=>!0,target:d}),s({clock:n,source:{step:a,title:m},fn:({step:e,title:t})=>({formId:u,title:t,step:e}),target:l(({formId:e,title:t,step:r})=>{c.eventBus({type:"form_submit",form:{id:e,title:t},experience:o,step:r??void 0})})}),s({clock:n,source:{stepFields:f},fn:({stepFields:e},t)=>(t.preventDefault(),T(e,new FormData(t.currentTarget))),target:F.executeFx}),s({clock:F.executeFx.doneData,target:P}),R({source:P.doneData,match:{hasErrors:({errors:e})=>e.length>0},cases:{hasErrors:S,__:h}}),s({clock:h.doneData,target:y}),s({clock:y,fn:e=>({data:e,stopNavigation:_}),target:g.executeFx}),s({clock:g.executeFx.done,target:x}),s({clock:x,source:D,filter:e=>!e,target:p}),s({clock:S.doneData,target:v}),s({clock:v,target:b.executeFx}),s({clock:[x,b.executeFx.done],fn:()=>!1,target:d}),{submitEvent:n,isFormSubmitting:d,onSubmit:F.register,onSuccess:g.register,onError:b.register,submitStarted:N,serverErrorsReceived:v}}export{q as createSubmitPipeline};

package/dist/form/create-submit-pipeline.svelte.d.ts

@@ -0,0 +1,53 @@
+import { ExperienceInstance, ExperienceStep, FieldValue, FieldWithStatus, Picked, ValidationError } from '@picked/client';
+import { Event, EventCallable, Store } from 'effector';
+export type SubmitEventWithCurrentTarget = SubmitEvent & {
+    currentTarget: EventTarget & HTMLFormElement;
+};
+export type SuccessCallback<TFieldIds extends string = string> = (options: {
+    data: Record<TFieldIds, FieldValue>;
+    stopNavigation: EventCallable<void>;
+}) => void | Promise<void>;
+export type ErrorCallback = (errors: ValidationError[]) => void | Promise<void>;
+export type SubmitCallback<TFieldIds extends string = string> = (data: Record<TFieldIds, FieldValue>) => Record<TFieldIds, FieldValue> | void | Promise<Record<TFieldIds, FieldValue> | void>;
+export interface SubmitPipelineConfig {
+    client: Picked;
+    experienceInstance: ExperienceInstance;
+    formId: string;
+    title: Store<string>;
+    stepStore: Store<ExperienceStep | null>;
+    fieldsStore: Store<FieldWithStatus[]>;
+    goToNextStep: EventCallable<void>;
+}
+export interface SubmitPipeline {
+    submitEvent: EventCallable<SubmitEventWithCurrentTarget>;
+    isFormSubmitting: Store<boolean>;
+    onSubmit: (callback: SubmitCallback) => void;
+    onSuccess: (callback: SuccessCallback) => void;
+    onError: (callback: ErrorCallback) => void;
+    /**
+     * Fired when a submit attempt starts — callers use this to clear validation state.
+     * Separating this from `submitEvent` keeps the pipeline decoupled from the
+     * validation module's internal stores.
+     */
+    submitStarted: Event<void>;
+    /**
+     * Fired when the server returns validation errors — callers write these to
+     * `fieldErrorsStore` in the validation module.
+     */
+    serverErrorsReceived: Event<ValidationError[]>;
+}
+/**
+ * Creates the submit pipeline for a form instance.
+ *
+ * Manages the full lifecycle of a form submission:
+ * - Emitting event bus calls (form_submit, form_submit_success, form_submit_error)
+ * - Running onSubmit data-transform callbacks in series
+ * - Committing responses to the server
+ * - Running onSuccess/onError callbacks in parallel
+ * - Navigating to the next step (unless stopNavigation is called)
+ *
+ * Returns coordination events (`submitStarted`, `serverErrorsReceived`) that the
+ * caller wires to the validation module to keep validation state in sync without
+ * the pipeline needing direct access to validation stores.
+ */
+export declare function createSubmitPipeline({ client, experienceInstance, formId, title, stepStore, fieldsStore, goToNextStep, }: SubmitPipelineConfig): SubmitPipeline;

package/dist/form/create-submit-pipeline.svelte.js

@@ -0,0 +1 @@
+export * from './create-submit-pipeline.js';

package/dist/form/get-form.d.ts

@@ -0,0 +1,16 @@
+import { ValidationError } from '@picked/client';
+interface GetFormOptions {
+    id: string;
+    title: string;
+    onSuccess?: () => void | Promise<void>;
+    onError?: (errors: ValidationError[]) => void | Promise<void>;
+}
+type SubmitEventWithCurrentTarget = SubmitEvent & {
+    currentTarget: EventTarget & HTMLFormElement;
+};
+export declare function getForm({ id: formId, title, onError, onSuccess }: GetFormOptions): {
+    form: {
+        onsubmit: import('effector').EventCallable<SubmitEventWithCurrentTarget>;
+    };
+};
+export {};

package/dist/form/get-form.js

@@ -0,0 +1 @@
+import{createEvent as _,createEffect as f,attach as v,sample as y,split as k}from"effector";import{getPicked as D,getExperience as F}from"../hooks/client.js";import"@picked/client";import{getStep as B}from"../hooks/step.js";import"svelte";import"svelte/store";import"@picked/analytics";function z({id:m,title:l,onError:b,onSuccess:g}){const a=D(),x=B(),i=F(),{currentStepStore:u}=i,d=_(),h=f(t=>a.responses.commit(t)),E=v({source:{step:u},effect:f(({step:t})=>{a.eventBus({type:"form_submit_success",form:{id:m,title:l},experience:i,step:t??void 0}),g?.()})}),S=v({source:{step:u},mapParams:(t,s)=>({step:s.step,errors:t.errors}),effect:f(({step:t,errors:s})=>{a.eventBus({type:"form_submit_error",form:{id:m,title:l},exception:{reason:s},experience:i,step:t??void 0}),s.forEach(c=>{a.eventBus({type:"field_validation_error",exception:{reason:[c]},experience:i,step:t??void 0})}),b?.(s)})});return y({clock:d,source:{step:u},fn:({step:t})=>({formId:m,title:l,step:t}),target:f(({formId:t,title:s,step:c})=>{a.eventBus({type:"form_submit",form:{id:t,title:s},experience:i,step:c??void 0})})}),y({clock:d,source:{fields:a.fields.listStore,stepFields:x.fields,step:u},fn:({stepFields:t},s)=>{s.preventDefault();const c=new FormData(s.currentTarget),A=Array.from(c.entries()),p={data:{},push(r){const o=r.questionId,e=this.data[o];e?Array.isArray(e)&&Array.isArray(r.value)?Array.isArray(e)&&Array.isArray(r.value)&&(typeof e[0]=="string"?this.data[o]=[...e,...r.value].map(String):typeof e[0]=="number"?this.data[o]=[...e,...r.value].map(Number):typeof e[0]=="boolean"?this.data[o]=[...e,...r.value].map(n=>!!n):this.data[o]=r.value):this.data[o]=r.value:this.data[o]=r.value}};return t.forEach(r=>{const o=A.filter(([e])=>e===r.id);o.length!==0&&o.forEach(([,e])=>{const n=r.id;if(e===""){p.push({questionId:n,value:null});return}switch(r.type){case"text":p.push({questionId:n,value:r.multiple?[String(e)]:String(e)});break;case"number":p.push({questionId:n,value:r.multiple?[Number(e)]:Number(e)});break;case"boolean":p.push({questionId:n,value:r.multiple?[e==="true"]:e==="true"});break}})}),p.data},target:h}),k({source:h.doneData,match:{hasErrors:({errors:t})=>t.length>0},cases:{hasErrors:S,__:E}}),{form:{onsubmit:d}}}export{z as getForm};

package/dist/form/index.d.ts

@@ -1,16 +1,2 @@
-import { ValidationError } from '@picked/client';
-interface GetFormOptions {
-    id: string;
-    title: string;
-    onSuccess?: () => void | Promise<void>;
-    onError?: (errors: ValidationError[]) => void | Promise<void>;
-}
-type SubmitEventWithCurrentTarget = SubmitEvent & {
-    currentTarget: EventTarget & HTMLFormElement;
-};
-export declare function getForm({ id: formId, title, onError, onSuccess }: GetFormOptions): {
-    form: {
-        onsubmit: import('effector').EventCallable<SubmitEventWithCurrentTarget>;
-    };
-};
-export {};
+export type { FormField } from './create-form.svelte';
+export { getForm } from './get-form';

package/dist/form/index.js

@@ -1 +1 @@
-import{createEvent as _,createEffect as m,attach as v,sample as y,split as k}from"effector";import{getPicked as D,getExperience as F}from"../hooks/client.js";import"@picked/client";import{getStep as B}from"../hooks/step.js";import"svelte";import"svelte/store";import"@picked/analytics";function z({id:f,title:l,onError:b,onSuccess:g}){const a=D(),x=B(),i=F(),{currentStepStore:u}=i,d=_(),h=m(r=>a.responses.commit(r)),E=v({source:{step:u},effect:m(({step:r})=>{a.eventBus({type:"form_submit_success",form:{id:f,title:l},experience:i,step:r??void 0}),g?.()})}),S=v({source:{step:u},mapParams:(r,o)=>({step:o.step,errors:r.errors}),effect:m(({step:r,errors:o})=>{a.eventBus({type:"form_submit_error",form:{id:f,title:l},exception:{reason:o},experience:i,step:r??void 0}),o.forEach(c=>{a.eventBus({type:"field_validation_error",exception:{reason:[c]},experience:i,step:r??void 0})}),b?.(o)})});return y({clock:d,source:{step:u},fn:({step:r})=>({formId:f,title:l,step:r}),target:m(({formId:r,title:o,step:c})=>{a.eventBus({type:"form_submit",form:{id:r,title:o},experience:i,step:c??void 0})})}),y({clock:d,source:{fields:a.fields.listStore,stepFields:x.fields,step:u},fn:({stepFields:r},o)=>{o.preventDefault();const c=new FormData(o.currentTarget),A=Array.from(c.entries()),p={data:{},push(t){const s=t.questionId,e=this.data[s];e?Array.isArray(e)&&Array.isArray(t.value)?Array.isArray(e)&&Array.isArray(t.value)&&(typeof e[0]=="string"?this.data[s]=[...e,...t.value].map(String):typeof e[0]=="number"?this.data[s]=[...e,...t.value].map(Number):typeof e[0]=="boolean"?this.data[s]=[...e,...t.value].map(n=>!!n):this.data[s]=t.value):this.data[s]=t.value:this.data[s]=t.value}};return r.forEach(t=>{let s=A.filter(([e])=>e===t.id);s.length===0&&(s=[[t.id,""]]),s.forEach(([,e])=>{const n=t.id;if(e===""){p.push({questionId:n,value:null});return}switch(t.type){case"text":p.push({questionId:n,value:t.multiple?[String(e)]:String(e)});break;case"number":p.push({questionId:n,value:t.multiple?[Number(e)]:Number(e)});break;case"boolean":p.push({questionId:n,value:t.multiple?[e==="true"]:e==="true"});break}})}),p.data},target:h}),k({source:h.doneData,match:{hasErrors:({errors:r})=>r.length>0},cases:{hasErrors:S,__:E}}),{form:{onsubmit:d}}}export{z as getForm};
+import{getForm as e}from"./get-form.js";export{e as getForm};

package/dist/hooks/field.d.ts

@@ -4,4 +4,9 @@ export interface GetFieldResponse {
     value: Store<FieldValue>;
     field: Store<Field | null>;
 }
+/**
+ * @deprecated Field options and status are now available directly on the Field object
+ * from the step fields store. Use `field.options`, `field.status`, and `field.error`
+ * instead of accessing them through this hook.
+ */
 export declare function getField(id: string): GetFieldResponse;

package/dist/hooks/step.d.ts

@@ -1,13 +1,13 @@
 import { Store } from 'effector';
-import { ExperienceStep, Field, Response } from '@picked/client';
-type FieldWithValue = Field & {
-    value: Response | undefined;
-};
-export interface StepContext {
+import { ExperienceStep } from '@picked/client';
+import { FormInstance, FormField } from '../form/create-form.svelte';
+export interface StepContext extends FormInstance {
     step: Store<ExperienceStep>;
-    fields: Store<FieldWithValue[]>;
+    /** Directly accessible fields with current response values — usable without a form */
+    fields: Store<FormField[]>;
+    isActive: Store<boolean>;
+    /** @deprecated Use `isActive` instead */
     isActiveStep: Store<boolean>;
 }
-export declare function getStep(): StepContext;
 export declare function setStepContext(stepId: string): StepContext;
-export {};
+export declare function getStep(): StepContext;

package/dist/hooks/step.js

@@ -1 +1 @@
-import{getContext as v,setContext as x}from"svelte";import{createStore as E,combine as a,attach as h,createEffect as w,sample as c}from"effector";import{getStepFields as A}from"@picked/client";import{STEP_CONTEXT_KEY as l}from"../context.js";import{getStepRouter as C}from"../router/context.js";import{getExperience as F,getPicked as T}from"./client.js";function K(){return v(l)}function N(i){const u=F(),o=T(),{activeStep:S}=C(),s=S.map(e=>e?.id===i),p=u.treeStore.map(e=>{const t=e.steps.find(r=>r.id===i);if(!t)throw new Error(`Step with id "${i}" not found in the experience tree.`);return t}),f=E([]),d=a({fields:f,responses:o.responses.listStore},({fields:e,responses:t})=>e.map(r=>{const m=t.find(g=>g.fieldId===r.id)?.value;return{...r,value:m}})),n=h({source:a({step:p,fields:o.fields.listStore}),effect:w(async({step:{fieldIds:e},fields:t})=>await A(o,t.filter(r=>e.includes(r.id))))});return c({source:{isActiveStep:s},filter:({isActiveStep:e})=>e,target:n}),c({clock:o.responses.listStore,source:{isActiveStep:s},filter:({isActiveStep:e})=>e,target:n}),c({source:n.doneData,target:f}),x(l,{step:p,fields:d,isActiveStep:s})}export{K as getStep,N as setStepContext};
+import{getContext as h,onMount as A,setContext as E}from"svelte";import{createEffect as g,createEvent as O,sample as p}from"effector";import{STEP_CONTEXT_KEY as x}from"../context.js";import{createForm as k}from"../form/create-form.svelte";import{getStepRouter as C}from"../router/context.js";import{getPicked as I,getExperience as _}from"./client.js";function b(c){const o=_().treeStore.map(s=>{const d=s.steps.find(f=>f.id===c);if(!d)throw new Error(`Step with id "${c}" not found in the experience tree.`);return d}),l=o.map(s=>s.label),u=o.map(s=>s.fieldIds),r=k(c,l,u);return{stepStore:o,form:r}}function K(c){const{activeStep:a}=C(),o=a.map(e=>e?.id===c),{stepStore:l,form:u}=b(c),r=I(),s=g(e=>{r.fields.resolveAll(e)});function d(e,n){return e.dependsOn?.length?e.dependsOn.every(i=>{const t=n[i];return t!=null&&t!==""&&!(Array.isArray(t)&&t.length===0)}):!0}const f=O();p({clock:f,source:{step:l,fields:r.fields.listStore},fn:({step:e,fields:n})=>e.fieldIds.filter(i=>!n.find(t=>t.id===i)?.dependsOn?.length),target:s});const m=g(({step:e,fields:n,responses:i})=>{for(const t of e.fieldIds){const S=n.find(v=>v.id===t);S?.dependsOn?.length&&(d(S,i)?r.fields.resolveAll([t],{force:!0,context:{responses:i}}):r.fields.setWaiting(t))}});return p({clock:f,source:{step:l,fields:r.fields.listStore,responses:r.responses.getAllStore},target:m}),A(()=>{f()}),p({clock:o,source:{step:l,fields:r.fields.listStore},filter:(e,n)=>n,fn:({step:e,fields:n})=>e.fieldIds.filter(i=>!n.find(t=>t.id===i)?.dependsOn?.length),target:s}),p({clock:o,source:{step:l,fields:r.fields.listStore,responses:r.responses.getAllStore},filter:(e,n)=>n,target:m}),E(x,{step:l,isActive:o,isActiveStep:o,...u})}function M(){return h(x)}export{M as getStep,K as setStepContext};

package/dist/plugins/devtools/components/ExperienceInstanceListItem.svelte

@@ -20,7 +20,7 @@
   <td>{$currentNode?.id || ''}</td>
   <td>{$currentNode?.type || ''}</td>
   <td>{$currentStep?.id || ''}</td>
-  <td>{$currentStep?.title || ''}</td>
+  <td>{$currentStep?.label || ''}</td>
   <td>{totalNextStepNodes}</td>
   <td>{$stepsToOrigin[0]} - {$stepsToOrigin[1]}</td>
   <td>{$stepsToLeaf[0]} - {$stepsToLeaf[1]}</td>

package/dist/plugins/devtools/screens/experiences/ExperienceTreeScreen.svelte

@@ -9,7 +9,7 @@
   let zoom = 1
   let selectedNode = null
   let highlightedPath: string[][] = []
-  let error = null
+  let error: string | null = null
   const loading = false
 
   let treeRenderingDone = false
@@ -35,10 +35,62 @@
     _referenceTo?: string
   }
 
+  function isRecord(val: unknown): val is Record<string, unknown> {
+    return val !== null && typeof val === 'object' && !Array.isArray(val)
+  }
+
+  function formatLogicRule(rule: unknown): string {
+    if (rule === null || rule === undefined) return '?'
+    if (typeof rule === 'string') return rule
+    if (typeof rule === 'number' || typeof rule === 'boolean') return String(rule)
+    if (Array.isArray(rule)) {
+      return rule.map(formatLogicRule).join(', ')
+    }
+    if (isRecord(rule)) {
+      const keys = Object.keys(rule)
+      if (keys.length === 0) return 'Condition'
+      const op = keys[0]
+      const args = rule[op]
+
+      if (op === 'var') {
+        return String(Array.isArray(args) ? args[0] : args)
+      }
+
+      const compOps: Record<string, string> = {
+        '==': '=',
+        '===': '=',
+        '!=': '≠',
+        '!==': '≠',
+        '>': '>',
+        '<': '<',
+        '>=': '≥',
+        '<=': '≤',
+      }
+      if (op in compOps && Array.isArray(args) && args.length >= 2) {
+        return `${formatLogicRule(args[0])} ${compOps[op]} ${formatLogicRule(args[1])}`
+      }
+      if (op === 'and' && Array.isArray(args)) {
+        return args.map(formatLogicRule).join(' & ')
+      }
+      if (op === 'or' && Array.isArray(args)) {
+        return args.map(formatLogicRule).join(' | ')
+      }
+      if ((op === '!' || op === 'not') && Array.isArray(args)) {
+        return `!${formatLogicRule(args[0])}`
+      }
+      if (op === 'in' && Array.isArray(args) && args.length >= 2) {
+        return `${formatLogicRule(args[0])} in ${formatLogicRule(args[1])}`
+      }
+      return `${op}(?)`
+    }
+    return '?'
+  }
+
   function renderGraph() {
     d3.select(svgEl).selectAll('*').remove()
 
     const stepsMap = new Map(steps.map((s) => [s.id, s]))
+    const conditionalsMap = new Map(conditionals.map((c) => [c.id, c]))
     const outgoingEdges = new Map<string, ExperienceEdge[]>()
     edges.forEach((e) => {
       if (!outgoingEdges.has(e.sourceNodeId)) outgoingEdges.set(e.sourceNodeId, [])
@@ -49,7 +101,12 @@
       if (node.type === 'origin') return 'Start'
       if (node.type === 'step' && node.stepId)
         return stepsMap.get(node.stepId)?.label ?? 'Unknown Step'
-      if (node.type === 'conditional' && node.conditionalId) return `Condition`
+      if (node.type === 'conditional' && node.conditionalId) {
+        const conditional = conditionalsMap.get(node.conditionalId)
+        if (conditional?.label) return conditional.label
+        if (conditional?.condition) return formatLogicRule(conditional.condition)
+        return 'Condition'
+      }
       return 'Unknown Node'
     }
 
@@ -81,15 +138,16 @@
     }
 
     if (rootNode) {
-      const convertGraphToTree = (
-        node: ProcessedNode,
-        visited = new Set<string>(),
-      ): ProcessedNode => {
-        if (visited.has(node.id)) {
+      // Use a global visited set so join nodes (multiple incoming branches converging
+      // to the same node) only appear once in the tree, with reference nodes on
+      // subsequent visits to indicate the convergence point.
+      const globalVisited = new Set<string>()
+      const convertGraphToTree = (node: ProcessedNode): ProcessedNode => {
+        if (globalVisited.has(node.id)) {
           return {
             ...node,
             id: `${node.id}_ref`,
-            name: `${node.name} (ref)`,
+            name: `↩ ${node.name}`,
             type: `${node.type}_ref`,
             children: [],
             _isReference: true,
@@ -97,9 +155,8 @@
           }
         }
 
-        const newVisited = new Set(visited)
-        newVisited.add(node.id)
-        return { ...node, children: node.children.map((c) => convertGraphToTree(c, newVisited)) }
+        globalVisited.add(node.id)
+        return { ...node, children: node.children.map((c) => convertGraphToTree(c)) }
       }
 
       const treeData = convertGraphToTree(rootNode)
@@ -128,31 +185,75 @@
 
       const g = svg.append('g').attr('transform', `translate(${margin.left},${margin.top})`)
 
+      const linkGenerator = d3
+        .linkHorizontal<d3.HierarchyPointLink<ProcessedNode>, ProcessedNode>()
+        .x((d) => d.y)
+        .y((d) => d.x)
+
       g.selectAll('.link')
         .data(treeRoot.links())
         .enter()
         .append('path')
         .attr('class', 'link')
         .attr('fill', 'none')
-        .attr('stroke', '#94a3b8')
+        .attr('stroke', (d: any) => {
+          if (d.source.data.type !== 'conditional') return '#94a3b8'
+          const targetId = d.target.data._isReference
+            ? d.target.data._referenceTo
+            : d.target.data.id
+          const edge = d.source.data._originalEdges.find(
+            (e: ExperienceEdge) => e.destinationNodeId === targetId,
+          )
+          if (edge?.sourceNodeHandle === 'true') return '#10b981'
+          if (edge?.sourceNodeHandle === 'false') return '#ef4444'
+          return '#94a3b8'
+        })
         .attr('stroke-width', 2)
-        .attr(
-          'd',
-          d3
-            .linkHorizontal<d3.HierarchyPointLink<ProcessedNode>, ProcessedNode>()
-            .x((d) => d.y)
-            .y((d) => d.x),
-        )
+        .attr('d', linkGenerator)
+
+      // Label true/false branches from conditional nodes
+      g.selectAll('.edge-label')
+        .data(treeRoot.links().filter((d: any) => d.source.data.type === 'conditional'))
+        .enter()
+        .append('text')
+        .attr('class', 'edge-label')
+        .attr('text-anchor', 'middle')
+        .attr('font-size', '10px')
+        .attr('font-weight', 'bold')
+        .attr('x', (d: any) => (d.source.y + d.target.y) / 2)
+        .attr('y', (d: any) => (d.source.x + d.target.x) / 2 - 6)
+        .attr('fill', (d: any) => {
+          const targetId = d.target.data._isReference
+            ? d.target.data._referenceTo
+            : d.target.data.id
+          const edge = d.source.data._originalEdges.find(
+            (e: ExperienceEdge) => e.destinationNodeId === targetId,
+          )
+          if (edge?.sourceNodeHandle === 'true') return '#10b981'
+          if (edge?.sourceNodeHandle === 'false') return '#ef4444'
+          return '#64748b'
+        })
+        .text((d: any) => {
+          const targetId = d.target.data._isReference
+            ? d.target.data._referenceTo
+            : d.target.data.id
+          const edge = d.source.data._originalEdges.find(
+            (e: ExperienceEdge) => e.destinationNodeId === targetId,
+          )
+          if (edge?.sourceNodeHandle === 'true') return 'Yes'
+          if (edge?.sourceNodeHandle === 'false') return 'No'
+          return ''
+        })
 
-      const nodes = g
+      const nodesSelection = g
         .selectAll('.node')
         .data(treeRoot.descendants())
         .enter()
         .append('g')
         .attr('class', 'node')
-        .attr('transform', (d: any) => `translate(${d.y},${d.x})`) // d3.HierarchyPointNode uses x, y
+        .attr('transform', (d: any) => `translate(${d.y},${d.x})`)
 
-      nodes
+      nodesSelection
         .append('circle')
         .attr('r', (d: any) => (d.data.type === 'origin' ? 15 : 10))
         .attr('fill', (d: any) => {
@@ -164,14 +265,14 @@
         .attr('stroke', '#fff')
         .attr('stroke-width', 2)
 
-      nodes
+      nodesSelection
         .append('text')
         .attr('dy', (d: any) => (d.children ? -15 : 25))
         .attr('text-anchor', 'middle')
         .attr('font-size', '12px')
         .attr('fill', '#1e293b')
         .text((d: any) =>
-          d.data.name.length > 25 ? `${d.data.name.slice(0, 22)}...` : d.data.name,
+          d.data.name.length > 30 ? `${d.data.name.slice(0, 27)}...` : d.data.name,
         )
 
       svg.on('dblclick.zoom', null) // Remove default double click zoom

package/dist/plugins/devtools/screens/responses/ResponseTableRow.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { ResponseListItem, PrimitiveFieldValue, Field } from '@picked/client'
+  import type { ResponseListItem, PrimitiveFieldValue, Field, FieldValue } from '@picked/client'
   import { getPicked } from '../../../../hooks'
   import { Button, Text, CodeBlock, Banner, Stack } from '../../ui'
 
@@ -11,9 +11,10 @@
   let isEditing = false
   let editValue = ''
   let editError = ''
-  let selectedOptions: Set<PrimitiveFieldValue> = new Set()
+  let selectedOptions: Set<FieldValue> = new Set()
 
-  $: hasOptions = field?.options && field.options.length > 0
+  $: hasOptions = Array.isArray(field?.options) && field.options.length > 0
+  $: staticOptions = Array.isArray(field?.options) ? field.options : null
   $: currentValue = response?.value ?? null
 
   function formatValue(value: unknown): string {
@@ -52,7 +53,7 @@
     selectedOptions = new Set()
   }
 
-  function toggleOption(optionValue: PrimitiveFieldValue) {
+  function toggleOption(optionValue: FieldValue) {
     if (field?.multiple) {
       if (selectedOptions.has(optionValue)) {
         selectedOptions.delete(optionValue)
@@ -65,7 +66,7 @@
     }
   }
 
-  function parseValue(input: string): unknown {
+  function parseValue(input: string): FieldValue {
     input = input.trim()
 
     if (input === '' || input === '-') {
@@ -99,14 +100,14 @@
 
   async function saveEdit() {
     try {
-      let newValue: unknown
+      let newValue: FieldValue
 
       if (hasOptions) {
         const values = Array.from(selectedOptions)
         if (field?.multiple) {
           newValue = values
         } else {
-          newValue = values[0] ?? null
+          newValue = values.at(0) ?? null
         }
       } else {
         newValue = parseValue(editValue)
@@ -142,9 +143,9 @@
   <td>
     {#if isEditing}
       <Stack direction="vertical" gap="small">
-        {#if hasOptions && field?.options}
+        {#if hasOptions && staticOptions}
           <Stack direction="vertical" gap="small">
-            {#each field.options as option (option.id)}
+            {#each staticOptions as option (option.id)}
               <label class="option-label">
                 {#if field.multiple}
                   <input

package/package.json

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