Fix a bug when undefined query params could be passed

leancodepl · Sep 16, 2020 · 8a221e9 · 8a221e9
1 parent 73eb6f3
commit 8a221e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/__tests__/types/index.test-d.ts b/__tests__/types/index.test-d.ts
@@ -16,6 +16,9 @@ const routes = createRouting({
 // Passes without arguments when there are no required parameters or query parameters
 expectType<string>(routes.login());
 
+// Does not allow undefined query params in single paths
+expectError(routes.login({}, { a: "a" }));
+
 // Passes when the required param is specified
 expectType<string>(routes.user({ userId: "12" }));
 

diff --git a/src/createRouting.ts b/src/createRouting.ts
@@ -18,7 +18,9 @@ type PathPatternArgs<
 > = [TRequiredParams] extends [never]
     ? [TRequiredQuery] extends [never]
         ? [TOptionalParams] extends [never]
-            ? [EmptyObject?, Partial<Record<TOptionalQuery, string>>?]
+            ? [TOptionalQuery] extends [never]
+                ? []
+                : [EmptyObject?, Partial<Record<TOptionalQuery, string>>?]
             : [Partial<Record<TOptionalParams, string>>?]
         : [TOptionalParams] extends [never]
         ? [EmptyObject, Record<TRequiredQuery, string> & Partial<Record<TOptionalQuery, string>>]