Handle params passing

igorkamyshev · Sep 5, 2023 · 5b84d35 · 5b84d35
1 parent d119696
commit 5b84d35
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 5 deletions.
diff --git a/packages/atomic-router/src/__tests__/fresh.test.ts b/packages/atomic-router/src/__tests__/fresh.test.ts
@@ -1,6 +1,8 @@
 import { createQuery } from '@farfetched/core';
+import { chainRoute, createRoute } from 'atomic-router';
 import { allSettled, createWatch, fork } from 'effector';
 import { describe, expect, test, vi } from 'vitest';
+
 import { createDefer } from '../defer';
 import { freshChain } from '../fresh';
 
@@ -27,7 +29,7 @@ describe('freshChain', () => {
     // First open — execute
     allSettled(chain.beforeOpen, {
       scope,
-      params: { params: undefined, query: {} },
+      params: { params: 1, query: {} },
     });
 
     expect(handler).toBeCalledTimes(1);
@@ -43,7 +45,7 @@ describe('freshChain', () => {
     // Second open — just openOp immediately
     await allSettled(chain.beforeOpen, {
       scope,
-      params: { params: undefined, query: {} },
+      params: { params: 1, query: {} },
     });
 
     expect(handler).toBeCalledTimes(1);
@@ -53,7 +55,7 @@ describe('freshChain', () => {
     // Third open — execute, because of changed params
     allSettled(chain.beforeOpen, {
       scope,
-      params: { params: undefined, query: { some: 2 } },
+      params: { params: 2, query: {} },
     });
 
     expect(handler).toBeCalledTimes(2);
@@ -66,4 +68,26 @@ describe('freshChain', () => {
     expect(openOnListener).toBeCalledTimes(3);
     expect(cancelOnListener).not.toBeCalled();
   });
+
+  test('pass route params to query', async () => {
+    const handler = vi.fn().mockImplementation(() => null);
+    const query = createQuery({
+      handler,
+    });
+
+    const route = createRoute<{ id: number }>();
+    const chainedRoute = chainRoute({ route, ...freshChain(query) });
+
+    const scope = fork();
+
+    await allSettled(route.open, { scope, params: { id: 1 } });
+
+    expect(handler).toBeCalledTimes(1);
+    expect(handler).toBeCalledWith({ id: 1 });
+
+    await allSettled(route.open, { scope, params: { id: 2 } });
+
+    expect(handler).toBeCalledTimes(2);
+    expect(handler).toBeCalledWith({ id: 2 });
+  });
 });
diff --git a/packages/atomic-router/src/__tests__/start.test.ts b/packages/atomic-router/src/__tests__/start.test.ts
@@ -1,6 +1,8 @@
 import { createQuery } from '@farfetched/core';
+import { chainRoute, createRoute } from 'atomic-router';
 import { allSettled, createStore, createWatch, fork } from 'effector';
 import { describe, expect, test, vi } from 'vitest';
+
 import { createDefer } from '../defer';
 import { startChain } from '../start';
 
@@ -87,4 +89,26 @@ describe('startChain', () => {
     expect(openOnListener).not.toBeCalled();
     expect(cancelOnListener).toBeCalledTimes(1);
   });
+
+  test('pass route params to query', async () => {
+    const handler = vi.fn().mockImplementation(() => null);
+    const query = createQuery({
+      handler,
+    });
+
+    const route = createRoute<{ id: number }>();
+    const chainedRoute = chainRoute({ route, ...startChain(query) });
+
+    const scope = fork();
+
+    await allSettled(route.open, { scope, params: { id: 1 } });
+
+    expect(handler).toBeCalledTimes(1);
+    expect(handler).toBeCalledWith({ id: 1 });
+
+    await allSettled(route.open, { scope, params: { id: 2 } });
+
+    expect(handler).toBeCalledTimes(2);
+    expect(handler).toBeCalledWith({ id: 2 });
+  });
 });
diff --git a/packages/atomic-router/src/fresh.ts b/packages/atomic-router/src/fresh.ts
@@ -19,7 +19,11 @@ export function freshChain(
   const openOn = createEvent<any>();
   const cancelOn = createEvent<any>();
 
-  sample({ clock: beforeOpen, target: query.refresh });
+  sample({
+    clock: beforeOpen,
+    fn: ({ params }) => params,
+    target: query.refresh,
+  });
   sample({
     clock: [
       query.finished.success,

diff --git a/packages/atomic-router/src/start.ts b/packages/atomic-router/src/start.ts
@@ -19,7 +19,11 @@ export function startChain(
   const openOn = createEvent<any>();
   const cancelOn = createEvent<any>();
 
-  sample({ clock: beforeOpen, target: query.start });
+  sample({
+    clock: beforeOpen,
+    fn: ({ params }) => params,
+    target: query.start,
+  });
   sample({ clock: query.finished.success, target: openOn });
   sample({
     clock: [query.finished.failure, query.finished.skip],