From 07c172e5f6dec507f25824c2821f1ad2a81fbfc8 Mon Sep 17 00:00:00 2001 From: dominuskernel Date: Wed, 10 Jan 2018 11:51:11 +0100 Subject: [PATCH 1/6] fix style code error --- types/navigo/index.d.ts | 7 ++++--- types/navigo/navigo-tests.ts | 14 +++++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/types/navigo/index.d.ts b/types/navigo/index.d.ts index 660e44dad7..73131a9d72 100644 --- a/types/navigo/index.d.ts +++ b/types/navigo/index.d.ts @@ -2,9 +2,10 @@ // Project: https://github.com/krasimir/navigo // Definitions by: Adrian Ehrsam // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.1 -type Keys = string -type State = {[k in Keys]: any} +type Keys = string; +type State = {[k in Keys]: any}; type Params = State; interface NavigoHooks { @@ -46,7 +47,7 @@ declare class Navigo { resolve(currentURL?: string): boolean; link(path: string): string; - + lastRouteResolved(): {url: string, query: string}; disableIfAPINotAvailable(): void; diff --git a/types/navigo/navigo-tests.ts b/types/navigo/navigo-tests.ts index a59bf3cfab..1aeb645ce8 100644 --- a/types/navigo/navigo-tests.ts +++ b/types/navigo/navigo-tests.ts @@ -1,14 +1,22 @@ import Navigo = require("navigo"); +type Keys = string; +type State = {[k in Keys]: any}; +type Params = State; + const root = null; const useHash = false; let router = new Navigo(root, useHash); +const before = (done: (suppress?: boolean) => void, params: Params) => done(); + +const after = (params: Params) => params; + router.hooks({ - before: function(done, params) { //do something }, - after: function(params) { //do something } - }); + before, + after +}); router .on('/products/list', () => { From af1e2b71dc65036ef79b70f3bfc53a94c51a1dc1 Mon Sep 17 00:00:00 2001 From: dominuskernel Date: Sun, 14 Jan 2018 18:35:25 +0100 Subject: [PATCH 2/6] add methods types to Navigo and update the version --- types/navigo/index.d.ts | 10 +++++++--- types/navigo/navigo-tests.ts | 9 +++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/types/navigo/index.d.ts b/types/navigo/index.d.ts index 73131a9d72..bb4681dd56 100644 --- a/types/navigo/index.d.ts +++ b/types/navigo/index.d.ts @@ -1,4 +1,4 @@ -// Type definitions for navigo 4.0 +// Type definitions for navigo 6.0 // Project: https://github.com/krasimir/navigo // Definitions by: Adrian Ehrsam // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped @@ -20,7 +20,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 { /** @@ -44,6 +44,8 @@ declare class Navigo { generate(path: string, params?: any): string; + getLinkPath(link: any): any; + resolve(currentURL?: string): boolean; link(path: string): string; @@ -52,9 +54,11 @@ declare class Navigo { disableIfAPINotAvailable(): void; + historyAPIUpdateMethod(method?: string): void; + hooks(hooks: GenericHooks): void; - pause(): void; + pause(change?: boolean): void; resume(): void; diff --git a/types/navigo/navigo-tests.ts b/types/navigo/navigo-tests.ts index 1aeb645ce8..b702df93c8 100644 --- a/types/navigo/navigo-tests.ts +++ b/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,11 @@ router.pause(); router.navigate('/en/products'); router.resume(); // or .pause(false) +router.pause(); +router.historyAPIUpdateMethod('replaceState'); +router.disableIfAPINotAvailable(); +router.resume(); + router.on( '/user/edit', () => { From d095efb7a653267e49cb0ed451d866b9226bc5cc Mon Sep 17 00:00:00 2001 From: dominuskernel Date: Mon, 15 Jan 2018 02:22:11 +0100 Subject: [PATCH 3/6] add type for off method --- Abandonando | 0 Añadiendo | 0 Comprimiendo | 0 Generando | 0 types/navigo/index.d.ts | 2 ++ types/navigo/navigo-tests.ts | 5 +++++ 6 files changed, 7 insertions(+) create mode 100644 Abandonando create mode 100644 Añadiendo create mode 100644 Comprimiendo create mode 100644 Generando diff --git a/Abandonando b/Abandonando new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Añadiendo b/Añadiendo new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Comprimiendo b/Comprimiendo new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Generando b/Generando new file mode 100644 index 0000000000..e69de29bb2 diff --git a/types/navigo/index.d.ts b/types/navigo/index.d.ts index bb4681dd56..053192b7ec 100644 --- a/types/navigo/index.d.ts +++ b/types/navigo/index.d.ts @@ -36,6 +36,8 @@ declare class Navigo { on(rootHandler: RouteHandler, hooks?: NavigoHooks): Navigo; + off(handler: { [key: string]: RouteHandler }): void; + notFound(handler: ((query: string) => void), hooks?: NavigoHooks): void; navigate(path: string, absolute?: boolean): void; diff --git a/types/navigo/navigo-tests.ts b/types/navigo/navigo-tests.ts index b702df93c8..d0c162702b 100644 --- a/types/navigo/navigo-tests.ts +++ b/types/navigo/navigo-tests.ts @@ -120,6 +120,11 @@ 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( From 23525e579310d8b6327f17320c7d6f4e278c8919 Mon Sep 17 00:00:00 2001 From: dominuskernel Date: Mon, 15 Jan 2018 12:22:28 +0100 Subject: [PATCH 4/6] change the off method types --- types/navigo/index.d.ts | 2 +- types/navigo/navigo-tests.ts | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/types/navigo/index.d.ts b/types/navigo/index.d.ts index 053192b7ec..58af71a564 100644 --- a/types/navigo/index.d.ts +++ b/types/navigo/index.d.ts @@ -36,7 +36,7 @@ declare class Navigo { on(rootHandler: RouteHandler, hooks?: NavigoHooks): Navigo; - off(handler: { [key: string]: RouteHandler }): void; + off(location: string, handler: RouteHandler): void; notFound(handler: ((query: string) => void), hooks?: NavigoHooks): void; diff --git a/types/navigo/navigo-tests.ts b/types/navigo/navigo-tests.ts index d0c162702b..b3094c053f 100644 --- a/types/navigo/navigo-tests.ts +++ b/types/navigo/navigo-tests.ts @@ -120,11 +120,7 @@ router.resume(); // or .pause(false) router.pause(); router.historyAPIUpdateMethod('replaceState'); router.disableIfAPINotAvailable(); -router.off({ - '/trip/:number': { - as: 'trip', uses: (params, query) => {} - } -}); +router.off('/trip/:number', { as: 'trip', uses: (params, query) => {}}); router.resume(); router.on( From 619403ecc7d3045921ebf50a5f296ef133ff24a2 Mon Sep 17 00:00:00 2001 From: dominuskernel Date: Tue, 16 Jan 2018 23:55:33 +0100 Subject: [PATCH 5/6] change to the las navigo version 7.0.0 --- types/navigo/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/navigo/index.d.ts b/types/navigo/index.d.ts index 58af71a564..68d374449b 100644 --- a/types/navigo/index.d.ts +++ b/types/navigo/index.d.ts @@ -1,4 +1,4 @@ -// Type definitions for navigo 6.0 +// Type definitions for navigo 7.0 // Project: https://github.com/krasimir/navigo // Definitions by: Adrian Ehrsam // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped From bf05a96b10af764b11de75567c89799ba2369048 Mon Sep 17 00:00:00 2001 From: dominuskernel Date: Wed, 17 Jan 2018 23:05:49 +0100 Subject: [PATCH 6/6] add to me how author too --- types/navigo/index.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/types/navigo/index.d.ts b/types/navigo/index.d.ts index 68d374449b..ebc0ecb8c5 100644 --- a/types/navigo/index.d.ts +++ b/types/navigo/index.d.ts @@ -1,6 +1,7 @@ // Type definitions for navigo 7.0 // Project: https://github.com/krasimir/navigo // Definitions by: Adrian Ehrsam +// Dancespiele // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.1