chore: refactor

Author: OrionFable

src/index.ts

@@ -1,46 +1,48 @@
 export type {
-    ConfiguredRoute,
-    Route,
+    ActionProps,
+    Actions,
     AnyJson,
     AnyJsonArray,
+    ConfiguredRoute,
+    HttpMethods,
     Loader,
-    Actions,
+    LoaderProps,
     PathFormat,
+    Route,
     RouteData,
-    HttpMethods,
     WithoutGet,
-    LoaderProps,
-    ActionProps,
 } from "./types";
 export type { LinkProps } from "./router/link";
 export type { Paths } from "./types/paths";
 export type { QueryString } from "./types/query-string";
 export type { RouterNavigator } from "./router/router-navigator";
 export {
     Brouther,
-    useUrlSearchParams,
-    usePage,
+    Outlet,
+    useBasename,
     useDataLoader,
-    useNavigation,
     useErrorPage,
+    useHref,
+    useLoadingState,
+    useNavigation,
+    usePage,
     usePaths,
     useQueryString,
-    useHref,
     useRouteError,
-    useBasename,
+    useUrlSearchParams,
 } from "./brouther/brouther";
 export { BroutherError, NotFoundRoute } from "./utils/errors";
 export { Form } from "./form/form";
 export { Link } from "./router/link";
 export {
-    createRouter,
-    createMappedRouter,
-    createMappedRouter as createRouterMap,
-    createMappedRouter as createRecordRouter,
-    createRoute,
     asyncActions,
-    asyncLoader,
     asyncComponent,
+    asyncLoader,
+    createMappedRouter as createRecordRouter,
+    createMappedRouter as createRouterMap,
+    createMappedRouter,
+    createRoute,
+    createRouter,
 } from "./router/router";
 export { urlEntity, mergeUrlEntities, createHref, qsToString, transformData, createPaths, type GetPaths } from "./utils/utils";
 export { urlSearchParamsToJson, jsonToURLSearchParams, formToJson } from "./form/form-data-api";

src/router/link.tsx

@@ -5,12 +5,6 @@ import type { Paths } from "../types/paths";
 import type { QueryString } from "../types/query-string";
 import { AnyJson } from "../types";
 
-type ForwardRef = <Ref, Props = {}>(
-    render: (props: Props & React.RefAttributes<Ref>, ref: React.Ref<Ref>) => JSX.Element
-) => (props: Props & React.RefAttributes<Ref>) => JSX.Element;
-
-const forwardRefTyped = forwardRef as ForwardRef;
-
 const isLeftClick = (e: React.MouseEvent) => e.button === 0;
 
 const isMod = (event: React.MouseEvent): boolean => event.metaKey || event.altKey || event.ctrlKey || event.shiftKey;
@@ -31,11 +25,8 @@ export type LinkProps<Path extends string> = Omit<
 
 const httpRegex = /^https?:\/\//;
 
-export const Link = forwardRefTyped(
-    <TPath extends string>(
-        { href, state, replace = false, onClick, query, paths, ...props }: LinkProps<TPath>,
-        ref: React.Ref<HTMLAnchorElement>
-    ) => {
+export const Link: <TPath extends string>(props: LinkProps<TPath>, ref: React.MutableRefObject<HTMLAnchorElement>) => JSX.Element = forwardRef(
+    <TPath extends string>({ href, state, replace = false, onClick, query, paths, ...props }: LinkProps<TPath>, ref: any) => {
         const { push, replace: _replace } = useNavigation();
         const contextHref = useHref();
         const basename = useBasename();
@@ -50,4 +41,4 @@ export const Link = forwardRefTyped(
         };
         return <a {...props} href={_href} onClick={_onClick} ref={ref} />;
     }
-) as unknown;
+) as any;

src/router/router.ts

@@ -98,7 +98,8 @@ export const createRouter = <const T extends Function.Narrow<readonly Readonly<R
 
 export const createMappedRouter = <const T extends Function.Narrow<Router>, Basename extends string>(
     routes: T,
-    basename: Basename = "/" as any
+    basename: Basename = "/" as Basename,
+    historyCreate?: () => BrowserHistory
 ): CreateMappedRoute<T> => {
     const list = Object.keys(routes).map((id) => {
         const r = routes[id];
@@ -115,7 +116,7 @@ export const createMappedRouter = <const T extends Function.Narrow<Router>, Base
             data
         );
     });
-    return createRouter(list as any, basename) as any;
+    return createRouter(list as any, basename, historyCreate) as any;
 };
 
 export const asyncLoader =

src/types/x.ts

@@ -1,5 +1,3 @@
-import type { List, Union, Number, Object } from "ts-toolbelt";
-
 export namespace X {
     export type Nullable<T> = T | null;
 
@@ -10,12 +8,4 @@ export namespace X {
     export type AnyString<T extends string | number | symbol> = T | Omit<string, T>;
 
     export type Promisify<T> = T | Promise<T>;
-
-    export type ReduceKeys<T extends {}, Keys extends List.List, C extends number = 0> = Keys["length"] extends C
-        ? false
-        : T[Keys[C]] extends T[Keys[C]] | undefined
-        ? Object.UnionOf<Keys[C]> extends undefined | Object.UnionOf<Keys[C]>
-            ? true
-            : false
-        : ReduceKeys<T, Keys, Number.Add<C, 1>>;
 }