@picked/svelte 0.0.62-next.2 → 0.0.62-next.3

package/dist/hooks/events.js

@@ -1 +1 @@
-import{getExperience as e,getPicked as t}from"./client.js";import{attach as n}from"effector";import{trackRecommendationPresentEvent as r}from"@picked/analytics";var i=()=>{let{session:i,projectId:a}=t(),o=e();return n({source:{config:o.configStore,step:o.currentStepStore},async effect({config:e,step:t},n){if(!i||!t)throw Error(`Cannot track recommendation present event: missing session or experience data.`);return r({projectId:a,experience:{id:o.experienceId,title:e.name},sessionId:i.id,identifiers:i.identifiers,isUser:i.isUser,step:t,productList:n})}})};export{i as getTrackRecommendationPresentEvent};
+import{getExperience as e,getPicked as t}from"./client.js";import{attach as n}from"effector";import{trackRecommendationPresentEvent as r}from"@picked/analytics";var i=()=>{let{session:i,projectId:a}=t(),o=e();return n({source:{config:o.configStore,step:o.currentStepStore,sessionSnapshot:i.store},async effect({config:e,step:t,sessionSnapshot:n},i){if(!t)throw Error(`Cannot track recommendation present event: missing experience step.`);return r({projectId:a,experience:{id:o.experienceId,title:e.name},sessionId:n.id,identifiers:n.identifiers,isUser:n.isUser,step:t,productList:i})}})};export{i as getTrackRecommendationPresentEvent};

package/dist/router/StepRouter.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
   /** @file Root router component that manages step registration and active step detection via Effector. */
-  import { createEvent, createStore, sample } from 'effector'
-  import { supportsWindow } from '@picked/client'
+  import { combine, createEvent, createStore } from 'effector'
   import { getExperience } from '../hooks'
   import { setStepRouter, type Step } from './context'
 
@@ -9,57 +8,24 @@
 
   const { currentStepStore } = experience
 
-  const activeStepStore = createStore<Step | null>(null)
-  let hasActiveStep = false
   const stepsStore = createStore<Step[]>([])
 
-  const registerStepEvent = createEvent<Step>()
-  const unregisterStepEvent = createEvent<Step>()
-  const setActiveStepEvent = createEvent<Step | null>()
+  const registerStep = createEvent<Step>()
+  const unregisterStep = createEvent<Step>()
 
-  stepsStore.on(registerStepEvent, (state, step) => [...state, step])
-  stepsStore.on(unregisterStepEvent, (state, step) => state.filter((s) => s !== step))
+  stepsStore
+    .on(registerStep, (state, step) => [...state, step])
+    .on(unregisterStep, (state, step) => state.filter((s) => s !== step))
 
-  sample({
-    source: setActiveStepEvent,
-    filter: (step) => step !== null,
-    target: activeStepStore,
-  })
-
-  const registerStep = (step: Step) => {
-    // todo: getIsSSR context
-
-    if (!supportsWindow()) {
-      // In SSR we should set the activeStep immediately if it is a match.
-      // If there are more Routes being registered after a match is found,
-      // we just skip them.
-      if (hasActiveStep) return
-
-      const isMatchingStep = step.key === currentStepStore.getState()?.key
-
-      if (isMatchingStep) {
-        setActiveStepEvent(step)
-        hasActiveStep = true
-      }
-    } else {
-      registerStepEvent(step)
-    }
-  }
-
-  const unregisterStep = (step: Step) => {
-    unregisterStepEvent(step)
-  }
-
-  sample({
-    source: { steps: stepsStore, currentStep: currentStepStore },
-    fn: ({ steps, currentStep }) => steps.find((s) => s.key === currentStep?.key) || null,
-    target: setActiveStepEvent,
-  })
+  const activeStepStore = combine(
+    { steps: stepsStore, currentStep: currentStepStore },
+    ({ steps, currentStep }) => steps.find((s) => s.key === currentStep?.key) ?? null,
+  )
 
   setStepRouter({
     registerStep,
     unregisterStep,
-    activeStep: activeStepStore.map((val) => val),
+    activeStep: activeStepStore,
   })
 </script>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@picked/svelte",
-  "version": "0.0.62-next.2",
+  "version": "0.0.62-next.3",
   "dependencies": {
     "d3": "^7.9.0"
   },
@@ -88,7 +88,7 @@
   },
   "module": "./dist/index.js",
   "peerDependencies": {
-    "@picked/client": "0.0.62-next.2",
+    "@picked/client": "0.0.62-next.3",
     "effector": "^23.3.0",
     "svelte": "^5.46.4"
   },