From a7baa4eb91c11320cc065e459fc10bdb127ff206 Mon Sep 17 00:00:00 2001 From: Nattapong Sirilappanich Date: Thu, 21 Jun 2018 08:30:34 +0700 Subject: [PATCH 1/3] Define type for connect-mongodb-session --- .../connect-mongodb-session-test.ts | 39 +++++++++ types/connect-mongodb-session/index.d.ts | 31 ++++++++ types/connect-mongodb-session/tsconfig.json | 25 ++++++ types/connect-mongodb-session/tslint.json | 79 +++++++++++++++++++ 4 files changed, 174 insertions(+) create mode 100644 types/connect-mongodb-session/connect-mongodb-session-test.ts create mode 100644 types/connect-mongodb-session/index.d.ts create mode 100644 types/connect-mongodb-session/tsconfig.json create mode 100644 types/connect-mongodb-session/tslint.json diff --git a/types/connect-mongodb-session/connect-mongodb-session-test.ts b/types/connect-mongodb-session/connect-mongodb-session-test.ts new file mode 100644 index 0000000000..963be905c0 --- /dev/null +++ b/types/connect-mongodb-session/connect-mongodb-session-test.ts @@ -0,0 +1,39 @@ +import * as express from 'express' +import session = require('express-session') +import connectMongo = require('connect-mongodb-session') +let MongoDBStore = connectMongo(session) + +var app = express(); +var store = new MongoDBStore({ + uri: 'mongodb://localhost:27017/connect_mongodb_session_test', + collection: 'mySessions' +}, function(error) { + // some connection error occur +}); + +store.on('connected', function() { + store.client; // The underlying MongoClient object from the MongoDB driver +}); + +// Catch errors +store.on('error', function(error) { +}); + +app.use(require('express-session')({ + secret: 'This is a secret', + cookie: { + maxAge: 1000 * 60 * 60 * 24 * 7 // 1 week + }, + store: store, + // Boilerplate options, see: + // * https://www.npmjs.com/package/express-session#resave + // * https://www.npmjs.com/package/express-session#saveuninitialized + resave: true, + saveUninitialized: true +})); + +app.get('/', function(req, res) { + res.send('Hello ' + JSON.stringify(req.session)); +}); + +const server = app.listen(3000); \ No newline at end of file diff --git a/types/connect-mongodb-session/index.d.ts b/types/connect-mongodb-session/index.d.ts new file mode 100644 index 0000000000..c328a211b2 --- /dev/null +++ b/types/connect-mongodb-session/index.d.ts @@ -0,0 +1,31 @@ +// Type definitions for connect-mongodb-session +// Project: https://github.com/kcbanner/connect-mongodb-session +// Definitions by: Nattapong Sirilappanich +// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.3 + +/// + +import session = require('express-session'); +import * as express from 'express'; +import {MongoClient, MongoClientOptions} from 'mongodb' + +declare function connect(fn : (options?: session.SessionOptions) => express.RequestHandler) : connectMongodbSession.MongoDBStore + +declare namespace connectMongodbSession { + export interface MongoDBStore extends session.Store { + client : MongoClient + new(connection?: ConnectionInfo, callback?: (error : Error) => void) : MongoDBStore + } + + export interface ConnectionInfo { + idField? : string + collection : string + connectionOptions?: MongoClientOptions + databaseName?: string + expires?: number + uri : string + } +} + +export = connect \ No newline at end of file diff --git a/types/connect-mongodb-session/tsconfig.json b/types/connect-mongodb-session/tsconfig.json new file mode 100644 index 0000000000..cda475ae85 --- /dev/null +++ b/types/connect-mongodb-session/tsconfig.json @@ -0,0 +1,25 @@ +{ + "compilerOptions": { + "baseUrl": "../", + "forceConsistentCasingInFileNames": true, + "lib": [ + "es6" + ], + "module": "commonjs", + "noEmit": true, + "noImplicitAny": true, + "noImplicitThis": true, + "strictNullChecks": false, + "strictFunctionTypes": true, + "typeRoots": [ + "../" + ] + }, + "files": [ + "connect-mongodb-session-test.ts", + "index.d.ts" + ], + "exclude": [ + "node_modules" + ] +} \ No newline at end of file diff --git a/types/connect-mongodb-session/tslint.json b/types/connect-mongodb-session/tslint.json new file mode 100644 index 0000000000..a41bf5d19a --- /dev/null +++ b/types/connect-mongodb-session/tslint.json @@ -0,0 +1,79 @@ +{ + "extends": "dtslint/dt.json", + "rules": { + "adjacent-overload-signatures": false, + "array-type": false, + "arrow-return-shorthand": false, + "ban-types": false, + "callable-types": false, + "comment-format": false, + "dt-header": false, + "eofline": false, + "export-just-namespace": false, + "import-spacing": false, + "interface-name": false, + "interface-over-type-literal": false, + "jsdoc-format": false, + "max-line-length": false, + "member-access": false, + "new-parens": false, + "no-any-union": false, + "no-boolean-literal-compare": false, + "no-conditional-assignment": false, + "no-consecutive-blank-lines": false, + "no-construct": false, + "no-declare-current-package": false, + "no-duplicate-imports": false, + "no-duplicate-variable": false, + "no-empty-interface": false, + "no-for-in-array": false, + "no-inferrable-types": false, + "no-internal-module": false, + "no-irregular-whitespace": false, + "no-mergeable-namespace": false, + "no-misused-new": false, + "no-namespace": false, + "no-object-literal-type-assertion": false, + "no-padding": false, + "no-redundant-jsdoc": false, + "no-redundant-jsdoc-2": false, + "no-redundant-undefined": false, + "no-reference-import": false, + "no-relative-import-in-test": false, + "no-self-import": false, + "no-single-declare-module": false, + "no-string-throw": false, + "no-unnecessary-callback-wrapper": false, + "no-unnecessary-class": false, + "no-unnecessary-generics": false, + "no-unnecessary-qualifier": false, + "no-unnecessary-type-assertion": false, + "no-useless-files": false, + "no-var-keyword": false, + "no-var-requires": false, + "no-void-expression": false, + "no-trailing-whitespace": false, + "object-literal-key-quotes": false, + "object-literal-shorthand": false, + "one-line": false, + "one-variable-per-declaration": false, + "only-arrow-functions": false, + "prefer-conditional-expression": false, + "prefer-const": false, + "prefer-declare-function": false, + "prefer-for-of": false, + "prefer-method-signature": false, + "prefer-template": false, + "radix": false, + "semicolon": false, + "space-before-function-paren": false, + "space-within-parens": false, + "strict-export-declare-modifiers": false, + "trim-file": false, + "triple-equals": false, + "typedef-whitespace": false, + "unified-signatures": false, + "void-return": false, + "whitespace": false + } +} From 01631ac02666a9d177b929863a90ba73519f591c Mon Sep 17 00:00:00 2001 From: Nattapong Sirilappanich Date: Thu, 21 Jun 2018 12:48:23 +0700 Subject: [PATCH 2/3] rename file connect-mongodb-session-test.ts to connect-mongodb-session-tests.ts (Add 's' to test) --- ...t-mongodb-session-test.ts => connect-mongodb-session-tests.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename types/connect-mongodb-session/{connect-mongodb-session-test.ts => connect-mongodb-session-tests.ts} (100%) diff --git a/types/connect-mongodb-session/connect-mongodb-session-test.ts b/types/connect-mongodb-session/connect-mongodb-session-tests.ts similarity index 100% rename from types/connect-mongodb-session/connect-mongodb-session-test.ts rename to types/connect-mongodb-session/connect-mongodb-session-tests.ts From b5ade3abfd8bc6d39d9dae02dc96dc5f52b7931e Mon Sep 17 00:00:00 2001 From: Nattapong Sirilappanich Date: Thu, 21 Jun 2018 13:06:03 +0700 Subject: [PATCH 3/3] Reflect test file name change in tsconfig.json --- types/connect-mongodb-session/tsconfig.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/types/connect-mongodb-session/tsconfig.json b/types/connect-mongodb-session/tsconfig.json index cda475ae85..61b0db83b2 100644 --- a/types/connect-mongodb-session/tsconfig.json +++ b/types/connect-mongodb-session/tsconfig.json @@ -13,10 +13,12 @@ "strictFunctionTypes": true, "typeRoots": [ "../" + ], + "types": [ ] }, "files": [ - "connect-mongodb-session-test.ts", + "connect-mongodb-session-tests.ts", "index.d.ts" ], "exclude": [