fix: improve type of route()

Improves return type of route() by reducing Omit<...> and intersection types. fix #3
uhyo · Oct 17, 2020 · cae6bb6 · cae6bb6
1 parent 7778f9a
commit cae6bb6
Showing 1 changed file with 22 additions and 8 deletions.
diff --git a/src/builder/PathRouteBuilder/index.ts b/src/builder/PathRouteBuilder/index.ts
@@ -167,20 +167,34 @@ export class PathRouteBuilder<
     callback?: (route: PathSingleRouteInterface<ActionResult, Match>) => void
   ): PathRouteBuilder<
     ActionResult,
-    Omit<Defs, Key> &
-      {
-        [K in Key]: RouteDefinition<ActionResult, Match>;
-      },
+    Key extends keyof Defs
+      ? {
+          [K in keyof Defs]: Key extends K
+            ? RouteDefinition<ActionResult, Match>
+            : Defs[K];
+        }
+      : {
+          [K in keyof Defs | Key]: K extends keyof Defs
+            ? Defs[K]
+            : RouteDefinition<ActionResult, Match>;
+        },
     AnyFlag,
     ExactFlag,
     Match
   > {
     const result = new PathRouteBuilder<
       ActionResult,
-      Omit<Defs, Key> &
-        {
-          [K in Key]: RouteDefinition<ActionResult, Match>;
-        },
+      Key extends keyof Defs
+        ? {
+            [K in keyof Defs]: Key extends K
+              ? RouteDefinition<ActionResult, Match>
+              : Defs[K];
+          }
+        : {
+            [K in keyof Defs | Key]: K extends keyof Defs
+              ? Defs[K]
+              : RouteDefinition<ActionResult, Match>;
+          },
       AnyFlag,
       ExactFlag,
       Match