Revert "review(todo-app): resplit task/model"

This reverts commit 297281e.

Author: azinit

todo-app/src/entities/task/model/effects.ts

@@ -0,0 +1,12 @@
+import { createEffect } from "effector";
+import { typicodeApi } from "shared/api";
+
+export const getTasksListFx = createEffect((params?: typicodeApi.tasks.GetTasksListParams) => {
+    // Здесь также может быть доп. обработка эффекта
+    return typicodeApi.tasks.getTasksList(params);
+});
+
+export const getTaskByIdFx = createEffect((params: typicodeApi.tasks.GetTaskByIdParams) => {
+    // Здесь также может быть доп. обработка эффекта
+    return typicodeApi.tasks.getTaskById(params);
+});

todo-app/src/entities/task/model/events.ts

@@ -0,0 +1,5 @@
+import { createEvent } from "effector";
+import type { QueryConfig } from "./types";
+
+export const toggleTask = createEvent<number>();
+export const setQueryConfig = createEvent<QueryConfig>();

todo-app/src/entities/task/model/index.ts

@@ -1,57 +1,5 @@
-import { useStore, useStoreMap } from "effector-react";
-import * as tasks from "./tasks";
-import * as queryConfig from "./query-config";
-
-const useQueryConfig = () => {
-    return useStore(queryConfig.$queryConfig);
-};
-
-const useTasks = () => {
-    return useStore(tasks.$tasks);
-};
-
-const useTasksList = () => {
-    return useStoreMap({
-        store: tasks.$tasks,
-        keys: ["tasksList"],
-        fn: (state) => Object.values(state)
-    })
-};
-
-/**
- * Можно разруливать на уровне эффектов - но тогда нужно подключать дополнительную логику в стор
- * @remark Например скрывать/показывать таск при `toggleTask` событии
- */
-const useTasksListFiltered = () => {
-    const tasksList = useTasksList();
-    const queryConfig = useQueryConfig();
-
-    return tasksList.filter(task => (
-        queryConfig.completed === undefined ||
-        task.completed === queryConfig.completed
-    ));
-};
-
-/**
- * @remark Можно добавить потенциально debounce логику
- */
-const useLoading = () => {
-    const tasksList = useStore(tasks.getTasksListFx.pending);
-    const taskDetails = useStore(tasks.getTaskByIdFx.pending);
-    return {tasksList, taskDetails}
-};
-
-
-const useTask = (taskId: number): import("shared/api").Task | undefined => {
-    return useTasks()[taskId];
-};
-
-export const selectors = {
-    useQueryConfig,
-    useTasks,
-    useTask,
-    useLoading,
-    useTasksListFiltered,
-};
-
-export { tasks, queryConfig };
+export * as effects from "./effects";
+export * as selectors from "./selectors";
+export * as store from "./store";
+export * as events from "./events";
+export * from "./types";

todo-app/src/entities/task/model/query-config.ts

@@ -0,0 +1,48 @@
+import { useStore, useStoreMap } from "effector-react";
+import { $tasks, $queryConfig } from "./store";
+import { getTaskByIdFx, getTasksListFx } from "./effects";
+
+export const useQueryConfig = () => {
+    return useStore($queryConfig);
+};
+
+export const useTasks = () => {
+    return useStore($tasks);
+};
+
+export const useTasksList = () => {
+    return useStoreMap({
+        store: $tasks,
+        keys: ["tasksList"],
+        fn: (state) => Object.values(state)
+    })
+};
+
+/**
+ * Можно разруливать на уровне эффектов - но тогда нужно подключать дополнительную логику в стор
+ * @remark Например скрывать/показывать таск при `toggleTask` событии
+ */
+export const useTasksListFiltered = () => {
+    const tasksList = useTasksList();
+    const queryConfig = useQueryConfig();
+
+    return tasksList.filter(task => (
+        queryConfig.completed === undefined ||
+        task.completed === queryConfig.completed
+    ));
+};
+
+/**
+ * @remark Можно добавить потенциально debounce логику
+ */
+export const useLoading = () => {
+    const tasksList = useStore(getTasksListFx.pending);
+    const taskDetails = useStore(getTaskByIdFx.pending);
+    return {tasksList, taskDetails}
+};
+
+
+export const useTask = (taskId: number): import("shared/api").Task | undefined => {
+    return useTasks()[taskId];
+};
+

todo-app/src/entities/task/model/selectors.ts

@@ -0,0 +1,26 @@
+import { createStore } from "effector";
+import { normalize, schema } from "normalizr";
+import produce from "immer";
+import { getTasksListFx, getTaskByIdFx } from "./effects";
+import { toggleTask, setQueryConfig } from "./events";
+import { QueryConfig } from "./types";
+
+export const taskSchema = new schema.Entity("tasks");
+
+export const tasksInitialState: Record<number, import("shared/api").Task> = {};
+
+// В рамках демо некритично, но можно хранить и в виде массива без нормализации
+export const $tasks = createStore(tasksInitialState)
+  .on(getTasksListFx.doneData, (_, payload) => normalize(payload.data, [taskSchema]).entities.tasks)
+  .on(getTaskByIdFx.doneData, (state, payload) => ({
+    ...state,
+    ...normalize(payload.data, taskSchema).entities.tasks,
+  }))
+  .on(toggleTask, (state, taskId) => produce(state, draft => {
+    const task = draft[taskId];
+    task.completed = !task.completed;
+  }))
+
+// Можно вынести в отдельную директорию (для хранения нескольких моделей)
+export const $queryConfig = createStore<QueryConfig>({})
+  .on(setQueryConfig, (_, payload) => payload)

todo-app/src/entities/task/model/store.ts

@@ -0,0 +1,4 @@
+export type QueryConfig = {
+    completed?: boolean;
+    userId?: number;
+};

todo-app/src/entities/task/model/tasks.ts

@@ -1,7 +1,7 @@
 export type Filter = {
     id: number;
     title: string;
-    config: import("entities/task").taskModel.queryConfig.QueryConfig;
+    config: import("entities/task").taskModel.QueryConfig;
 }
 
 // Описываем здесь датасет фильтров "Закрытые" / "Открытые" и т.п.

todo-app/src/entities/task/model/types.ts

@@ -13,7 +13,7 @@ export const TasksFilters = ({ loading }: Props) => {
             {filtersList.map(({ title, id }) => (
                 <Radio.Button 
                     key={id} 
-                    onClick={() => taskModel.queryConfig.setQueryConfig(getFilterById(id).config)}
+                    onClick={() => taskModel.events.setQueryConfig(getFilterById(id).config)}
                     value={id}
                     disabled={loading}
                 >