Доработка хуков useQuery, useParams, покрытие тестами (#30)

src/core/hooks/usePageType.ts

@@ -0,0 +1,8 @@
+import {useMemo} from 'react';
+import {useLocation} from 'react-router-dom';
+import {getPageType} from '../utils/common';
+
+export const usePageType = () => {
+    const location = useLocation();
+    return useMemo(() => getPageType(location.pathname), [location.pathname]);
+};

src/core/hooks/useParams.ts

@@ -1,25 +1,10 @@
 import {useMemo} from 'react';
-import {useLocation, useParams as useReactParams} from 'react-router-dom';
-import {PageType} from '../enums/common';
-import {getPageType} from '../utils/common';
+import {useParams as useReactParams} from 'react-router-dom';
+import {getParamsFromUrl} from '../utils/getParamFromUrl';
+import {QueryParsers} from '../utils/getQueryFromUrl';
 
-type ParamsParser<T> = (value?: string) => T;
-export type ParamsParsers<T> = Partial<{[K in keyof T]: ParamsParser<T[K]>}>;
-
-export function useParams<T extends {[name: string]: unknown}>(paramParsers: ParamsParsers<T> = {}) {
+export function useParams<T extends Record<string, unknown>>(paramParsers: QueryParsers<T>) {
     const params = useReactParams<Record<keyof T, string>>();
-    const {pathname} = useLocation();
 
-    return useMemo(() => {
-        return Object.keys(paramParsers).reduce<T & {pageType: PageType}>((memo, key) => {
-            const parser = paramParsers[key];
-
-            return {
-                ...memo,
-                [key]: parser?.(params[key]),
-            };
-        }, {
-            pageType: getPageType(pathname),
-        } as T & {pageType: PageType});
-    }, [params, paramParsers, pathname]);
+    return useMemo(() => getParamsFromUrl(paramParsers, params), [params, paramParsers]);
 }

src/core/hooks/useQuery.ts

@@ -1,70 +1,9 @@
-import {parse, ParsedUrlQuery} from 'querystring';
-import {head} from 'lodash';
 import {useMemo} from 'react';
 import {useLocation} from 'react-router-dom';
-import {toNumber} from '../utils/parsers';
+import {getQueryFromUrl, QueryParsers} from '../utils/getQueryFromUrl';
 
-type QueryParser<T> = (value?: string | string[]) => T;
-export type QueryParsers<T> = Partial<{[K in keyof T]: QueryParser<T[K]>}>;
-
-export function stringParser<T extends string>(): QueryParser<Undefinable<T>>;
-export function stringParser<T extends string>(defaultValue: T): QueryParser<T>;
-export function stringParser<T extends string>(defaultValue?: T) {
-    return (val?: string | string[]) => {
-        const value = Array.isArray(val) ? head(val) : val;
-
-        return value ?? defaultValue;
-    };
-}
-
-export function numberParser(): QueryParser<Undefinable<number>>;
-export function numberParser(defaultValue?: number): QueryParser<number>;
-export function numberParser(defaultValue?: number) {
-    return (val?: string | string[]) => {
-        const value = Array.isArray(val) ? head(val) : val;
-
-        return toNumber(value) ?? defaultValue;
-    };
-}
-
-export function booleanParser(): QueryParser<Undefinable<boolean>>;
-export function booleanParser(defaultValue: boolean): QueryParser<boolean>;
-export function booleanParser(defaultValue?: boolean) {
-    return (val?: string | string[]) => {
-        const value = Array.isArray(val) ? head(val) : val;
-
-        if (value === 'true') {
-            return true;
-        }
-
-        if (value === 'false') {
-            return false;
-        }
-
-        return defaultValue;
-    };
-}
-
-// Date parser
-
-// Array parser (должен уметь с enum)
-
-export function useQuery<T extends {[name: string]: unknown}>(
-    queryParsers: QueryParsers<T>
-): ParsedUrlQuery | Partial<T> {
+export function useQuery<T extends Record<string, unknown>>(queryParsers: QueryParsers<T>): T {
     const {search} = useLocation();
 
-    return useMemo(() => {
-        const query = parse(search.slice(1));
-        return queryParsers ? Object.keys(queryParsers).reduce<T>((memo, key) => {
-            if (key in queryParsers) {
-                const parser = queryParsers[key];
-                return {
-                    ...memo,
-                    [key]: parser?.(query[key]),
-                };
-            }
-            return memo;
-        }, {} as T) : query;
-    }, [search, queryParsers]);
+    return useMemo(() => getQueryFromUrl(queryParsers, search), [search, queryParsers]);
 }