Merge branch 'add-types-navigo' of https://github.com/dancespiele/DefinitelyTyped into dancespiele-add-types-navigo

types/navigo/index.d.ts

@@ -1,6 +1,7 @@
-// Type definitions for navigo 4.0
+// Type definitions for navigo 7.0
 // Project: https://github.com/krasimir/navigo
 // Definitions by: Adrian Ehrsam <https://github.com/aersamkull>
+//                 Dancespiele <https://github.com/dancespiele>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -20,7 +21,7 @@ interface GenericHooks {
     after?(params?: Params): void;
 }
 
-type RouteHandler = ((parametersObj: any, query: string) => void) | { as: string; uses(parametersObj: any): void };
+type RouteHandler = ((params: Params, query: string) => void) | { as: string; uses(params: Params, query: string): void };
 
 declare class Navigo {
     /**
@@ -36,6 +37,8 @@ declare class Navigo {
 
     on(rootHandler: RouteHandler, hooks?: NavigoHooks): Navigo;
 
+    off(location: string, handler: RouteHandler): void;
+
     notFound(handler: ((query: string) => void), hooks?: NavigoHooks): void;
 
     navigate(path: string, absolute?: boolean): void;
@@ -44,6 +47,8 @@ declare class Navigo {
 
     generate(path: string, params?: any): string;
 
+    getLinkPath(link: any): any;
+
     resolve(currentURL?: string): boolean;
 
     link(path: string): string;
@@ -52,9 +57,11 @@ declare class Navigo {
 
     disableIfAPINotAvailable(): void;
 
+    historyAPIUpdateMethod(method?: string): void;
+
     hooks(hooks: GenericHooks): void;
 
-    pause(): void;
+    pause(change?: boolean): void;
 
     resume(): void;
 

types/navigo/navigo-tests.ts

@@ -56,7 +56,7 @@ router
     .resolve();
 
 router
-    .on('/user/:id/:action', (params: { id: string; action: string }) => {
+    .on('/user/:id/:action', (params: Params) => {
         // If we have http://site.com/user/42/save as a url then
         // params.id = 42
         // params.action = save
@@ -64,7 +64,7 @@ router
     .resolve();
 
 router
-    .on('/user/:id/:action', (params: { id: string; action: string }, query: string) => {
+    .on('/user/:id/:action', (params: Params, query: string) => {
         // If we have http://site.com/user/42/save?answer=42 as a url then
         // params.id = 42
         // params.action = save
@@ -117,6 +117,12 @@ router.pause();
 router.navigate('/en/products');
 router.resume(); // or .pause(false)
 
+router.pause();
+router.historyAPIUpdateMethod('replaceState');
+router.disableIfAPINotAvailable();
+router.off('/trip/:number', { as: 'trip', uses: (params, query) => {}});
+router.resume();
+
 router.on(
     '/user/edit',
     () => {