From 4db61597fa28a9f8bbb19f410f6f38f80271d203 Mon Sep 17 00:00:00 2001 From: Xavier Stouder Date: Tue, 1 Mar 2016 15:13:50 +0100 Subject: [PATCH 1/7] Create connect-redis definitions --- connect-redis/connect-redis-tests.ts | 4 +++ connect-redis/connect-redis.d.ts | 38 ++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 connect-redis/connect-redis-tests.ts create mode 100644 connect-redis/connect-redis.d.ts diff --git a/connect-redis/connect-redis-tests.ts b/connect-redis/connect-redis-tests.ts new file mode 100644 index 0000000000..3c50074117 --- /dev/null +++ b/connect-redis/connect-redis-tests.ts @@ -0,0 +1,4 @@ +import * as connectRedis from "connect-redis"; +import * as session from "express-session"; + +let RedisStore = connectRedis(session); diff --git a/connect-redis/connect-redis.d.ts b/connect-redis/connect-redis.d.ts new file mode 100644 index 0000000000..4ba0490fe1 --- /dev/null +++ b/connect-redis/connect-redis.d.ts @@ -0,0 +1,38 @@ +// Type definitions for connect-redis +// Project: https://npmjs.com/package/connect-redis +// Definitions by: Xavier Stouder +// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped + +declare module "connect-redis" { + import * as express from "express"; + import * as session from "express-session"; + import * as redis from "redis"; + + function s(options: (options?: session.SessionOptions) => express.RequestHandler): s.RedisStore; + + namespace s { + interface RedisStore extends session.Store { + new (options: RedisStoreOptions): session.Store; + } + interface RedisStoreOptions { + client?: redis.RedisClient; + host?: string; + port?: number; + socket?: string; + url?: string; + ttl?: number; + disableTTL?: boolean; + db?: number; + pass?: string; + prefix?: string; + unref?: boolean; + serializer?: Serializer | JSON; + } + interface Serializer { + stringify: Function; + parse: Function; + } + } + + export = s; +} From ec13362958058efcaff223167f987f16a809e668 Mon Sep 17 00:00:00 2001 From: Xavier Stouder Date: Sat, 5 Mar 2016 17:56:49 +0100 Subject: [PATCH 2/7] Fix references path --- connect-redis/connect-redis.d.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/connect-redis/connect-redis.d.ts b/connect-redis/connect-redis.d.ts index 4ba0490fe1..21af697f38 100644 --- a/connect-redis/connect-redis.d.ts +++ b/connect-redis/connect-redis.d.ts @@ -4,9 +4,9 @@ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped declare module "connect-redis" { - import * as express from "express"; - import * as session from "express-session"; - import * as redis from "redis"; + /// + /// + /// function s(options: (options?: session.SessionOptions) => express.RequestHandler): s.RedisStore; From 252bd4bb4e881da01b0324cc40f7277098c6aead Mon Sep 17 00:00:00 2001 From: Xavier Stouder Date: Sat, 5 Mar 2016 17:58:29 +0100 Subject: [PATCH 3/7] Fix path --- connect-redis/connect-redis.d.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/connect-redis/connect-redis.d.ts b/connect-redis/connect-redis.d.ts index 21af697f38..078b99073c 100644 --- a/connect-redis/connect-redis.d.ts +++ b/connect-redis/connect-redis.d.ts @@ -4,9 +4,9 @@ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped declare module "connect-redis" { - /// - /// - /// + /// + /// + /// function s(options: (options?: session.SessionOptions) => express.RequestHandler): s.RedisStore; From 6513e0853e3522c0e06d346e048d815cb0331809 Mon Sep 17 00:00:00 2001 From: Xavier Stouder Date: Sat, 5 Mar 2016 18:01:14 +0100 Subject: [PATCH 4/7] References & imports --- connect-redis/connect-redis.d.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/connect-redis/connect-redis.d.ts b/connect-redis/connect-redis.d.ts index 078b99073c..b3a1529569 100644 --- a/connect-redis/connect-redis.d.ts +++ b/connect-redis/connect-redis.d.ts @@ -3,10 +3,15 @@ // Definitions by: Xavier Stouder // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +/// +/// +/// + declare module "connect-redis" { - /// - /// - /// + import * as express from "express"; + import * as session from "express-session"; + import * as redis from "redis"; + function s(options: (options?: session.SessionOptions) => express.RequestHandler): s.RedisStore; From e88d574f91aef319947931009d40477dc501a36e Mon Sep 17 00:00:00 2001 From: Xavier Stouder Date: Sat, 5 Mar 2016 18:03:42 +0100 Subject: [PATCH 5/7] Fix tests references --- connect-redis/connect-redis-tests.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/connect-redis/connect-redis-tests.ts b/connect-redis/connect-redis-tests.ts index 3c50074117..fa61b7304c 100644 --- a/connect-redis/connect-redis-tests.ts +++ b/connect-redis/connect-redis-tests.ts @@ -1,3 +1,6 @@ +/// +/// + import * as connectRedis from "connect-redis"; import * as session from "express-session"; From 91d48d1b2823289abec4aabd30dbc6d9899da206 Mon Sep 17 00:00:00 2001 From: Xavier Stouder Date: Sat, 5 Mar 2016 18:05:51 +0100 Subject: [PATCH 6/7] Fix name --- connect-redis/connect-redis-tests.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect-redis/connect-redis-tests.ts b/connect-redis/connect-redis-tests.ts index fa61b7304c..2ad4d53bd5 100644 --- a/connect-redis/connect-redis-tests.ts +++ b/connect-redis/connect-redis-tests.ts @@ -1,4 +1,4 @@ -/// +/// /// import * as connectRedis from "connect-redis"; From c2a803dacae48642c117fe358d8c1d929f4d1a0f Mon Sep 17 00:00:00 2001 From: Xavier Stouder Date: Thu, 10 Mar 2016 17:19:16 +0100 Subject: [PATCH 7/7] Update connect-redis-tests.ts --- connect-redis/connect-redis-tests.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect-redis/connect-redis-tests.ts b/connect-redis/connect-redis-tests.ts index 2ad4d53bd5..abc14977ee 100644 --- a/connect-redis/connect-redis-tests.ts +++ b/connect-redis/connect-redis-tests.ts @@ -1,4 +1,4 @@ -/// +/// /// import * as connectRedis from "connect-redis";