From 887c45291d89b832ad02b6fbfba0da5da32248b2 Mon Sep 17 00:00:00 2001 From: Joel Date: Fri, 9 Jun 2017 13:38:36 +0100 Subject: [PATCH 1/6] Adds fallback param to lookup function --- types/mime/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/mime/index.d.ts b/types/mime/index.d.ts index 73a094492b..449875034b 100644 --- a/types/mime/index.d.ts +++ b/types/mime/index.d.ts @@ -6,7 +6,7 @@ // Imported from: https://github.com/soywiz/typescript-node-definitions/mime.d.ts -export declare function lookup(path: string): string; +export declare function lookup(path: string, fallback: string): string; export declare function extension(mime: string): string; export declare function load(filepath: string): void; export declare function define(mimes: Object): void; From 4a53abc938f80e180f3a64fdcafc33363bf1a0f4 Mon Sep 17 00:00:00 2001 From: Joel Date: Fri, 9 Jun 2017 14:02:31 +0100 Subject: [PATCH 2/6] Adds tslint.json --- types/mime/tslint.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 types/mime/tslint.json diff --git a/types/mime/tslint.json b/types/mime/tslint.json new file mode 100644 index 0000000000..3db14f85ea --- /dev/null +++ b/types/mime/tslint.json @@ -0,0 +1 @@ +{ "extends": "dtslint/dt.json" } From f3ac12f02833a829de49996083df54d52af1a986 Mon Sep 17 00:00:00 2001 From: Joel Date: Fri, 9 Jun 2017 14:02:55 +0100 Subject: [PATCH 3/6] Fixes linting errors --- types/mime/index.d.ts | 17 ++++++++--------- types/mime/mime-tests.ts | 8 ++++---- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/types/mime/index.d.ts b/types/mime/index.d.ts index 449875034b..b0fb1c8735 100644 --- a/types/mime/index.d.ts +++ b/types/mime/index.d.ts @@ -1,19 +1,18 @@ -// Type definitions for mime +// Type definitions for mime 1.3 // Project: https://github.com/broofa/node-mime // Definitions by: Jeff Goddard // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // Imported from: https://github.com/soywiz/typescript-node-definitions/mime.d.ts +export function lookup(path: string, fallback: string): string; +export function extension(mime: string): string; +export function load(filepath: string): void; +export function define(mimes: { [key: string]: any }): void; -export declare function lookup(path: string, fallback: string): string; -export declare function extension(mime: string): string; -export declare function load(filepath: string): void; -export declare function define(mimes: Object): void; - -interface Charsets { +export interface Charsets { lookup(mime: string): string; } -export declare var charsets: Charsets; -export declare var default_type: string; +export const charsets: Charsets; +export const default_type: string; diff --git a/types/mime/mime-tests.ts b/types/mime/mime-tests.ts index abffa341f7..2eee9d9b12 100644 --- a/types/mime/mime-tests.ts +++ b/types/mime/mime-tests.ts @@ -1,10 +1,10 @@ - import * as mime from "mime"; -var str: string; -var obj: Object; +let str: string; +const obj: {} = {}; +const fallback: string = ''; -str = mime.lookup(str); +str = mime.lookup(str, fallback); str = mime.extension(str); mime.load(str); mime.define(obj); From c144d1caaf3c8f78e696a0121a9474735dee1e99 Mon Sep 17 00:00:00 2001 From: Joel Date: Fri, 9 Jun 2017 14:55:57 +0100 Subject: [PATCH 4/6] Fixes declarations to namespace --- types/mime/index.d.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/types/mime/index.d.ts b/types/mime/index.d.ts index b0fb1c8735..71b4677ac6 100644 --- a/types/mime/index.d.ts +++ b/types/mime/index.d.ts @@ -5,6 +5,8 @@ // Imported from: https://github.com/soywiz/typescript-node-definitions/mime.d.ts +export as namespace mime; + export function lookup(path: string, fallback: string): string; export function extension(mime: string): string; export function load(filepath: string): void; From 4c8419ee78c8dd5a61e97dbd7fb0d756f773a4f7 Mon Sep 17 00:00:00 2001 From: Joel Date: Mon, 12 Jun 2017 10:12:31 +0100 Subject: [PATCH 5/6] Removes whitespace from multer to fix linting issues --- types/multer/index.d.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/types/multer/index.d.ts b/types/multer/index.d.ts index 1199fbe181..fb9bee6c0d 100644 --- a/types/multer/index.d.ts +++ b/types/multer/index.d.ts @@ -41,7 +41,6 @@ declare namespace multer { headerPairs?: number; /** Keep the full path of files instead of just the base name (Default: false) */ preservePath?: boolean; - }; /** A function to control which files to upload and which to skip. */ fileFilter?(req: Express.Request, file: Express.Multer.File, callback: (error: Error, acceptFile: boolean) => void): void; From a0d5848d4ba7f1063431b3f7b04027516dddce19 Mon Sep 17 00:00:00 2001 From: Joel Date: Mon, 12 Jun 2017 10:48:01 +0100 Subject: [PATCH 6/6] send: removes setting default_type on mime in test.. .. as this is not possible (anymore) on the current library --- types/send/send-tests.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/types/send/send-tests.ts b/types/send/send-tests.ts index 22e3e171f2..da41697e96 100644 --- a/types/send/send-tests.ts +++ b/types/send/send-tests.ts @@ -5,7 +5,6 @@ import * as send from 'send'; var app = express(); -send.mime.default_type = 'text/plain'; send.mime.define({ 'application/x-my-type': ['x-mt', 'x-mtt'] }); @@ -34,4 +33,4 @@ app.get('/test.html', (req, res) => { res.setHeader('Content-Disposition', 'attachment'); }) .pipe(res); -}); \ No newline at end of file +});