child matches may be undefined

remix-run · Dec 2, 2024 · 463174f · 463174f
1 parent 748e9eb
commit 463174f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/integration/typegen-test.ts b/integration/typegen-test.ts
@@ -297,7 +297,10 @@ test.describe("typegen", () => {
           type Test3 = Expect<Equal<typeof current.data, { current: number }>>
 
           const child1 = matches[4]
-          type Test4 = Expect<Equal<typeof child1.data, unknown>>
+          type Test4a = Expect<undefined extends typeof child1 ? true : false>
+          if (child1) {
+            type Test4b = Expect<Equal<typeof child1.data, unknown>>
+          }
           return []
         }
 
@@ -312,7 +315,10 @@ test.describe("typegen", () => {
           type Test3 = Expect<Equal<typeof current.data, { current: number }>>
 
           const child1 = matches[4]
-          type Test4 = Expect<Equal<typeof child1.data, unknown>>
+          type Test4a = Expect<undefined extends typeof child1 ? true : false>
+          if (child1) {
+            type Test4b = Expect<Equal<typeof child1.data, unknown>>
+          }
         }
       `,
     });

diff --git a/packages/react-router/lib/types/route-module.ts b/packages/react-router/lib/types/route-module.ts
@@ -48,7 +48,7 @@ type MetaMatch<T extends RouteInfo> = Pretty<
 type MetaMatches<T extends RouteInfo[]> =
   T extends [infer F extends RouteInfo, ...infer R extends RouteInfo[]]
     ? [MetaMatch<F>, ...MetaMatches<R>]
-    : MetaMatch<RouteInfo>[];
+    : Array<MetaMatch<RouteInfo> | undefined>;
 
 export type CreateMetaArgs<T extends RouteInfo> = {
   location: Location;
@@ -149,7 +149,7 @@ type Match<T extends RouteInfo> = Pretty<
 type Matches<T extends RouteInfo[]> =
   T extends [infer F extends RouteInfo, ...infer R extends RouteInfo[]]
     ? [Match<F>, ...Matches<R>]
-    : Match<RouteInfo>[];
+    : Array<Match<RouteInfo> | undefined>;
 
 export type CreateComponentProps<T extends RouteInfo> = {
   params: T["params"];