Update Preact types with proper useLocation argument types.

Author: molefrog

types/preact/index.d.ts

@@ -14,7 +14,10 @@ export type Path = string;
 export type PushCallback = (to: Path, replace?: boolean) => void;
 
 export type LocationTuple = [Path, PushCallback];
-export type LocationHook = (props?: Pick<RouterProps, 'base'>) => LocationTuple;
+export interface LocationHookOptions {
+  base?: Path;
+}
+export type LocationHook = (options?: LocationHookOptions) => LocationTuple;
 
 export interface DefaultParams {
   [paramName: string]: string;
@@ -25,9 +28,14 @@ export interface RouteComponentProps<T extends DefaultParams = DefaultParams> {
   params: T;
 }
 
-export type MatchWithParams<T extends DefaultParams = DefaultParams> = [true, Params<T>];
+export type MatchWithParams<T extends DefaultParams = DefaultParams> = [
+  true,
+  Params<T>
+];
 export type NoMatch = [false, null];
-export type Match<T extends DefaultParams = DefaultParams> = MatchWithParams<T> | NoMatch;
+export type Match<T extends DefaultParams = DefaultParams> =
+  | MatchWithParams<T>
+  | NoMatch;
 
 export type MatcherFn = (pattern: Path, path: Path) => Match;
 
@@ -36,7 +44,9 @@ export interface RouteProps<T extends DefaultParams = DefaultParams> {
   path: Path;
   component?: ComponentType<RouteComponentProps<T>>;
 }
-export function Route<T extends DefaultParams = DefaultParams>(props: RouteProps<T>): VNode<any> | null; // tslint:disable-line:no-unnecessary-generics
+export function Route<T extends DefaultParams = DefaultParams>(
+  props: RouteProps<T> // tslint:disable-line:no-unnecessary-generics
+): VNode<any> | null;
 
 export type NavigationalProps =
   | { to: Path; href?: never }
@@ -60,14 +70,14 @@ export interface RouterProps {
   base: Path;
   matcher: MatcherFn;
 }
-export const Router: FunctionComponent<
-  Partial<RouterProps> & {
-    children: ComponentChildren;
-  }
->;
+export const Router: FunctionComponent<Partial<RouterProps> & {
+  children: ComponentChildren;
+}>;
 
 export function useRouter(): RouterProps;
 
-export function useRoute<T extends DefaultParams = DefaultParams>(pattern: Path): Match<T>; // tslint:disable-line:no-unnecessary-generics
+export function useRoute<T extends DefaultParams = DefaultParams>(
+  pattern: Path
+): Match<T>; // tslint:disable-line:no-unnecessary-generics
 
-export function useLocation(props?: Pick<RouterProps, 'base'>): LocationTuple;
+export function useLocation(): LocationTuple;

types/preact/type-specs.tsx

@@ -8,12 +8,12 @@ import {
   Router,
   Switch,
   useLocation,
-  useRoute,
+  useRoute
 } from "wouter/preact";
 
 const Header: FunctionComponent = () => <div />;
 const Profile = ({ params }: RouteComponentProps<{ id: string }>) => (
-    <div>User id: {params.id}</div>
+  <div>User id: {params.id}</div>
 );
 
 /*
@@ -23,7 +23,7 @@ const someParams: Params = { foo: "bar" };
 const someParamsWithGeneric: Params<{ foo: string }> = { foo: "bar" };
 
 // error: params should follow generic type
-const paramsDontMatchGeneric: Params<{ foo: string }> = { baz: "bar" };  // $ExpectError
+const paramsDontMatchGeneric: Params<{ foo: string }> = { baz: "bar" }; // $ExpectError
 
 // error: values are strings!
 const invalidParams: Params = { id: 13 }; // $ExpectError
@@ -57,9 +57,7 @@ const invalidParamsWithGeneric: Params<{ id: number }> = { id: 13 }; // $ExpectE
   {(params: Params): React.ReactNode => `User id: ${params.id}`}
 </Route>;
 
-<Route<{ id: string }> path="/users/:id">
-  {({ id }) => `User id: ${id}`}
-</Route>;
+<Route<{ id: string }> path="/users/:id">{({ id }) => `User id: ${id}`}</Route>;
 
 <Route<{ id: string }> path="/users/:id">
   {({ age }) => `User age: ${age}`} // $ExpectError
@@ -124,9 +122,7 @@ const invalidParamsWithGeneric: Params<{ id: number }> = { id: 13 }; // $ExpectE
   Hello, we have <Header /> and some {1337} numbers here.
 </Router>;
 
-<Router base="/app">
-  Hello World!
-</Router>;
+<Router base="/app">Hello World!</Router>;
 
 /*
  * Hooks API
@@ -138,6 +134,8 @@ setLocation(); // $ExpectError
 setLocation("/app");
 setLocation("/app", true);
 
+useLocation({ base: "/app" }); // $ExpectError
+
 useRoute(Symbol()); // $ExpectError
 useRoute(); // $ExpectError
 useRoute("/");
@@ -152,12 +150,7 @@ if (params) {
   params; // $ExpectType null
 }
 
-const [] = useLocation({basename: '/app'}); // $ExpectError
-const [, setLoc] = useLocation({base: '/base'});
-
-setLoc('/app');
-
-const [, parameters] = useRoute<{ id: string}>('/app/users/:id');
+const [, parameters] = useRoute<{ id: string }>("/app/users/:id");
 
 if (parameters) {
   parameters.id; // $ExpectType string