Add PrependBasePath test

swan-io · Oct 18, 2022 · b800ffd · b800ffd
1 parent 5dc11d5
commit b800ffd
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 10 deletions.
diff --git a/__tests__/types.ts b/__tests__/types.ts
@@ -10,6 +10,7 @@ import {
   NonEmptySplit,
   ParseRoute,
   ParseRoutes,
+  PrependBasePath,
 } from "../src/types";
 
 // @ts-expect-error
@@ -114,3 +115,35 @@ test("GetAreaRoutes", () => {
     }>(),
   );
 });
+
+test("PrependBasePath", () => {
+  type Input = {
+    a: ParseRoute<"/">;
+    b: ParseRoute<"/foo/bar">;
+    c: ParseRoute<"/foo?:bar#:baz">;
+  };
+
+  expectType<PrependBasePath<"", Input>>(
+    toBe<{
+      a: { path: "/"; search: ""; hash: "" };
+      b: { path: "/foo/bar"; search: ""; hash: "" };
+      c: { path: "/foo"; search: ":bar"; hash: ":baz" };
+    }>(),
+  );
+
+  expectType<PrependBasePath<"/", Input>>(
+    toBe<{
+      a: { path: "/"; search: ""; hash: "" };
+      b: { path: "/foo/bar"; search: ""; hash: "" };
+      c: { path: "/foo"; search: ":bar"; hash: ":baz" };
+    }>(),
+  );
+
+  expectType<PrependBasePath<"/base", Input>>(
+    toBe<{
+      a: { path: "/base"; search: ""; hash: "" };
+      b: { path: "/base/foo/bar"; search: ""; hash: "" };
+      c: { path: "/base/foo"; search: ":bar"; hash: ":baz" };
+    }>(),
+  );
+});
diff --git a/src/createRouter.ts b/src/createRouter.ts
@@ -18,24 +18,21 @@ import {
   ParsedRoute,
   ParseRoute,
   ParseRoutes,
-  PrependBaseRoute,
+  PrependBasePath,
   Simplify,
 } from "./types";
 
 export const createRouter = <
   Routes extends Record<string, string>,
-  BasePath extends string = "/",
+  BasePath extends string = "",
 >(
   routes: Readonly<Routes>,
   options: {
     basePath?: BasePath;
   } = {},
 ) => {
-  type RoutesWithBasePath = PrependBaseRoute<
-    ParseRoute<BasePath>,
-    ParseRoutes<Routes>
-  >;
-
+  type CleanBasePath = ParseRoute<BasePath>["path"];
+  type RoutesWithBasePath = PrependBasePath<CleanBasePath, ParseRoutes<Routes>>;
   type AreaRoutes = GetAreaRoutes<RoutesWithBasePath>;
   type AreaRoutesParams = GetRoutesParams<AreaRoutes>;
   type FiniteRoutes = Omit<RoutesWithBasePath, keyof AreaRoutes>;

diff --git a/src/types.ts b/src/types.ts
@@ -130,12 +130,12 @@ export type ConcatRoutes<
   "?"
 >}${AddPrefixOnNonEmpty<Route["hash"], "#">}`;
 
-export type PrependBaseRoute<
-  BaseRoute extends ParsedRoute,
+export type PrependBasePath<
+  BasePath extends string,
   Routes extends Record<string, ParsedRoute>,
 > = {
   [K in keyof Routes]: {
-    path: ConcatPaths<BaseRoute["path"], Routes[K]["path"]>;
+    path: ConcatPaths<BasePath, Routes[K]["path"]>;
     search: Routes[K]["search"];
     hash: Routes[K]["hash"];
   };