mime module shouldn't care about supported extensions/mime-types by file2html

dkniazevych · dkniazevych · commit 7049e0340c39 · 2017-07-20T15:22:12.000+02:00
diff --git a/README.md b/README.md
@@ -1,4 +1,10 @@
 # file2html
+[![Build Status](https://secure.travis-ci.org/file2html/file2html.png?branch=master)](https://travis-ci.org/file2html/file2html)
+[![npm](https://img.shields.io/npm/dm/file2html.svg)](https://www.npmjs.com/package/file2html)
+[![npm](https://img.shields.io/npm/v/file2html.svg)](https://www.npmjs.com/package/file2html)
+[![npm](https://img.shields.io/npm/l/file2html.svg)](https://www.npmjs.com/package/file2html)
+[![Coverage Status](https://coveralls.io/repos/github/file2html/file2html/badge.svg?branch=master)](https://coveralls.io/github/file2html/file2html?branch=master)
+
 > JS convertor of files to HTML and CSS code
 
 ## Requirements
diff --git a/lib/mime.d.ts b/lib/mime.d.ts
@@ -1,3 +1 @@
 export declare function lookup(filename: string): string;
-export declare function isSupportedExtension(extension: string): boolean;
-export declare function isSupportedMimeType(mimeType: string): boolean;
diff --git a/lib/mime.js b/lib/mime.js
@@ -11,26 +11,12 @@ var mimeTypes = {
     txt: 'text/plain',
     docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
     fb: 'application/x-fictionbook+xml',
-    fb2: 'application/x-fictionbook+xml'
+    fb2: 'application/x-fictionbook+xml',
+    odt: 'application/vnd.oasis.opendocument.text'
 };
 function lookup(filename) {
     var name = filename.toLowerCase();
     var extension = name.split('.').pop();
     return mimeTypes[extension];
 }
 exports.lookup = lookup;
-function isSupportedExtension(extension) {
-    return Boolean(mimeTypes[extension.replace(/^\./, '')]);
-}
-exports.isSupportedExtension = isSupportedExtension;
-function isSupportedMimeType(mimeType) {
-    for (var extension in mimeTypes) {
-        if (mimeTypes.hasOwnProperty(extension)) {
-            if (mimeType === mimeTypes[extension]) {
-                return true;
-            }
-        }
-    }
-    return false;
-}
-exports.isSupportedMimeType = isSupportedMimeType;
diff --git a/lib/text-encoding.d.ts b/lib/text-encoding.d.ts
@@ -5,5 +5,5 @@
  * @param {TextEncoding.TextDecodeOptions} [options]
  * @returns {string}
  */
-export declare function decode(content: Uint8Array, encoding?: string, options?: TextEncoding.TextDecodeOptions): string;
+export declare function decode(content: Uint8Array, encoding?: string, options?: TextEncoding.TextDecoderOptions): string;
 export declare function encode(text: string, encoding?: string, options?: TextEncoding.TextEncoderOptions): Uint8Array;
diff --git a/src/mime.ts b/src/mime.ts
@@ -9,28 +9,13 @@ const mimeTypes: {[key: string]: string} = {
     txt: 'text/plain',
     docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
     fb: 'application/x-fictionbook+xml',
-    fb2: 'application/x-fictionbook+xml'
+    fb2: 'application/x-fictionbook+xml',
+    odt: 'application/vnd.oasis.opendocument.text'
 };
 
 export function lookup (filename: string) {
     const name: string = filename.toLowerCase();
     const extension: string = name.split('.').pop();
 
     return mimeTypes[extension];
-}
-
-export function isSupportedExtension (extension: string): boolean {
-    return Boolean(mimeTypes[extension.replace(/^\./, '')]);
-}
-
-export function isSupportedMimeType (mimeType: string): boolean {
-    for (const extension in mimeTypes) {
-        if (mimeTypes.hasOwnProperty(extension)) {
-            if (mimeType === mimeTypes[extension]) {
-                return true;
-            }
-        }
-    }
-
-    return false;
 }
diff --git a/src/text-encoding.ts b/src/text-encoding.ts
@@ -4,7 +4,7 @@
  * @param {TextEncoding.TextDecodeOptions} [options]
  * @returns {string}
  */
-export function decode (content: Uint8Array, encoding?: string, options?: TextEncoding.TextDecodeOptions): string {
+export function decode (content: Uint8Array, encoding?: string, options?: TextEncoding.TextDecoderOptions): string {
     return new TextDecoder(encoding, options).decode(content);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1 @@`
`1`	`1`	`export declare function lookup(filename: string): string;`
`2`		`-export declare function isSupportedExtension(extension: string): boolean;`
`3`		`-export declare function isSupportedMimeType(mimeType: string): boolean;`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* @param {TextEncoding.TextDecodeOptions} [options]`
`5`	`5`	`* @returns {string}`
`6`	`6`	`*/`
`7`		`-export function decode (content: Uint8Array, encoding?: string, options?: TextEncoding.TextDecodeOptions): string {`
	`7`	`+export function decode (content: Uint8Array, encoding?: string, options?: TextEncoding.TextDecoderOptions): string {`
`8`	`8`	`return new TextDecoder(encoding, options).decode(content);`
`9`	`9`	`}`
`10`	`10`