file-type 15.0.1 → 16.2.0

package/core.d.ts

@@ -37,7 +37,6 @@ declare namespace core {
 		| 'webm'
 		| 'mov'
 		| 'avi'
-		| 'wmv'
 		| 'mpg'
 		| 'mp2'
 		| 'mp3'
@@ -99,7 +98,6 @@ declare namespace core {
 		| 'ape'
 		| 'wv'
 		| 'asf'
-		| 'wma'
 		| 'dcm'
 		| 'mpc'
 		| 'ics'
@@ -136,7 +134,10 @@ declare namespace core {
 		| 'eps'
 		| 'lzh'
 		| 'pgp'
-		| 'asar';
+		| 'asar'
+		| 'stl'
+		| 'chm'
+		| '3mf';
 
 	type MimeType =
 		| 'image/jpeg'
@@ -175,7 +176,7 @@ declare namespace core {
 		| 'video/vnd.avi'
 		| 'audio/vnd.wave'
 		| 'audio/qcelp'
-		| 'audio/x-ms-wma'
+		| 'audio/x-ms-asf'
 		| 'video/x-ms-asf'
 		| 'application/vnd.ms-asf'
 		| 'video/mpeg'
@@ -264,7 +265,10 @@ declare namespace core {
 		| 'image/avif'
 		| 'application/x-lzh-compressed'
 		| 'application/pgp-encrypted'
-		| 'application/x-asar';
+		| 'application/x-asar'
+		| 'model/stl'
+		| 'application/vnd.ms-htmlhelp'
+		| 'model/3mf';
 
 	interface FileTypeResult {
 		/**

package/core.js

@@ -55,15 +55,6 @@ function _check(buffer, headers, options) {
 	return true;
 }
 
-async function _checkSequence(sequence, tokenizer, ignoreBytes) {
-	const buffer = Buffer.alloc(minimumBytes);
-	await tokenizer.ignore(ignoreBytes);
-
-	await tokenizer.peekBuffer(buffer, {mayBeLess: true});
-
-	return buffer.includes(Buffer.from(sequence));
-}
-
 async function fromTokenizer(tokenizer) {
 	try {
 		return _fromTokenizer(tokenizer);
@@ -79,7 +70,6 @@ async function _fromTokenizer(tokenizer) {
 	const bytesRead = 12;
 	const check = (header, options) => _check(buffer, header, options);
 	const checkString = (header, options) => check(stringToBytes(header), options);
-	const checkSequence = (sequence, ignoreBytes) => _checkSequence(sequence, tokenizer, ignoreBytes);
 
 	// Keep reading until EOF if the file size is unknown.
 	if (!tokenizer.fileInfo.size) {
@@ -318,6 +308,13 @@ async function _fromTokenizer(tokenizer) {
 					};
 				}
 
+				if (zipHeader.filename.startsWith('3D/') && zipHeader.filename.endsWith('.model')) {
+					return {
+						ext: '3mf',
+						mime: 'model/3mf'
+					};
+				}
+
 				// The docx, xlsx and pptx file types extend the Office Open XML file format:
 				// https://en.wikipedia.org/wiki/Office_Open_XML_file_formats
 				// We look for:
@@ -589,9 +586,13 @@ async function _fromTokenizer(tokenizer) {
 	}
 
 	if (checkString('%PDF')) {
+		await tokenizer.ignore(1350);
+		const maxBufferSize = 10 * 1024 * 1024;
+		const buffer = Buffer.alloc(Math.min(maxBufferSize, tokenizer.fileInfo.size));
+		await tokenizer.readBuffer(buffer, {mayBeLess: true});
+
 		// Check if this is an Adobe Illustrator file
-		const isAiFile = await checkSequence('Adobe Illustrator', 1350);
-		if (isAiFile) {
+		if (buffer.includes(Buffer.from('AIPrivateData'))) {
 			return {
 				ext: 'ai',
 				mime: 'application/postscript'
@@ -880,6 +881,13 @@ async function _fromTokenizer(tokenizer) {
 		}
 	}
 
+	if (checkString('ITSF')) {
+		return {
+			ext: 'chm',
+			mime: 'application/vnd.ms-htmlhelp'
+		};
+	}
+
 	// -- 6-byte signatures --
 
 	if (check([0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00])) {
@@ -920,6 +928,13 @@ async function _fromTokenizer(tokenizer) {
 		};
 	}
 
+	if (checkString('solid ')) {
+		return {
+			ext: 'stl',
+			mime: 'model/stl'
+		};
+	}
+
 	// -- 7-byte signatures --
 
 	if (checkString('BLENDER')) {
@@ -1062,15 +1077,15 @@ async function _fromTokenizer(tokenizer) {
 				if (_check(typeId, [0x40, 0x9E, 0x69, 0xF8, 0x4D, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B])) {
 					// Found audio:
 					return {
-						ext: 'wma',
-						mime: 'audio/x-ms-wma'
+						ext: 'asf',
+						mime: 'audio/x-ms-asf'
 					};
 				}
 
 				if (_check(typeId, [0xC0, 0xEF, 0x19, 0xBC, 0x4D, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B])) {
 					// Found video:
 					return {
-						ext: 'wmv',
+						ext: 'asf',
 						mime: 'video/x-ms-asf'
 					};
 				}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "file-type",
-	"version": "15.0.1",
+	"version": "16.2.0",
 	"description": "Detect the file type of a Buffer/Uint8Array/ArrayBuffer",
 	"license": "MIT",
 	"repository": "sindresorhus/file-type",
@@ -133,7 +133,6 @@
 		"odp",
 		"xml",
 		"heic",
-		"wma",
 		"ics",
 		"glb",
 		"pcap",
@@ -152,7 +151,6 @@
 		"f4v",
 		"mie",
 		"qcp",
-		"wmv",
 		"asf",
 		"ogv",
 		"ogm",
@@ -180,7 +178,10 @@
 		"eps",
 		"lzh",
 		"pgp",
-		"asar"
+		"asar",
+		"stl",
+		"chm",
+		"3mf"
 	],
 	"devDependencies": {
 		"@types/node": "^13.1.4",
@@ -191,7 +192,7 @@
 		"xo": "^0.25.3"
 	},
 	"dependencies": {
-		"readable-web-to-node-stream": "^2.0.0",
+		"readable-web-to-node-stream": "^3.0.0",
 		"strtok3": "^6.0.3",
 		"token-types": "^2.0.0",
 		"typedarray-to-buffer": "^3.1.5"

package/readme.md

@@ -1,9 +1,11 @@
-# file-type [![Build Status](https://travis-ci.com/sindresorhus/file-type.svg?branch=master)](https://travis-ci.com/github/sindresorhus/file-type)
+# file-type
 
 > Detect the file type of a Buffer/Uint8Array/ArrayBuffer
 
 The file type is detected by checking the [magic number](https://en.wikipedia.org/wiki/Magic_number_(programming)#Magic_numbers_in_files) of the buffer.
 
+This package is for detecting binary-based file formats, not text-based formats like `.txt`, `.csv`, `.svg`, etc.
+
 ## Install
 
 ```
@@ -367,8 +369,6 @@ Returns a set of supported MIME types.
 - [`ape`](https://en.wikipedia.org/wiki/Monkey%27s_Audio) - Monkey's Audio
 - [`wv`](https://en.wikipedia.org/wiki/WavPack) - WavPack
 - [`asf`](https://en.wikipedia.org/wiki/Advanced_Systems_Format) - Advanced Systems Format
-- [`wma`](https://en.wikipedia.org/wiki/Windows_Media_Audio) - Windows Media Audio
-- [`wmv`](https://en.wikipedia.org/wiki/Windows_Media_Video) - Windows Media Video
 - [`dcm`](https://en.wikipedia.org/wiki/DICOM#Data_format) - DICOM Image File
 - [`mpc`](https://en.wikipedia.org/wiki/Musepack) - Musepack (SV7 & SV8)
 - [`ics`](https://en.wikipedia.org/wiki/ICalendar#Data_format) - iCalendar
@@ -403,13 +403,16 @@ Returns a set of supported MIME types.
 - [`lzh`](https://en.wikipedia.org/wiki/LHA_(file_format)) - LZH archive
 - [`pgp`](https://en.wikipedia.org/wiki/Pretty_Good_Privacy) - Pretty Good Privacy
 - [`asar`](https://github.com/electron/asar#format) - Archive format primarily used to enclose Electron applications
+- [`stl`](https://en.wikipedia.org/wiki/STL_(file_format)) - Standard Tesselated Geometry File Format (ASCII only)
+- [`chm`](https://en.wikipedia.org/wiki/Microsoft_Compiled_HTML_Help) - Microsoft Compiled HTML Help
+- [`3mf`](https://en.wikipedia.org/wiki/3D_Manufacturing_Format) - 3D Manufacturing Format
 
 *Pull requests are welcome for additional commonly used file types.*
 
 The following file types will not be accepted:
 - [MS-CFB: Microsoft Compound File Binary File Format based formats](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-cfb/53989ce4-7b05-4f8d-829b-d08d6148375b), too old and difficult to parse:
-	- `.doc` - Microsoft Word 97-2003 Document 
-	- `.xls` - Microsoft Excel 97-2003 Document 
+	- `.doc` - Microsoft Word 97-2003 Document
+	- `.xls` - Microsoft Excel 97-2003 Document
 	- `.ppt` - Microsoft PowerPoint97-2003 Document
 	- `.msi` - Microsoft Windows Installer
 - `.csv` - [Reason.](https://github.com/sindresorhus/file-type/issues/264#issuecomment-568439196)

package/supported.js

@@ -98,8 +98,6 @@ module.exports = {
 		'ktx',
 		'ape',
 		'wv',
-		'wmv',
-		'wma',
 		'dcm',
 		'ics',
 		'glb',
@@ -134,7 +132,10 @@ module.exports = {
 		'eps',
 		'lzh',
 		'pgp',
-		'asar'
+		'asar',
+		'stl',
+		'chm',
+		'3mf'
 	],
 	mimeTypes: [
 		'image/jpeg',
@@ -173,7 +174,7 @@ module.exports = {
 		'video/vnd.avi',
 		'audio/vnd.wave',
 		'audio/qcelp',
-		'audio/x-ms-wma',
+		'audio/x-ms-asf',
 		'video/x-ms-asf',
 		'application/vnd.ms-asf',
 		'video/mpeg',
@@ -262,6 +263,9 @@ module.exports = {
 		'image/avif',
 		'application/x-lzh-compressed',
 		'application/pgp-encrypted',
-		'application/x-asar'
+		'application/x-asar',
+		'model/stl',
+		'application/vnd.ms-htmlhelp',
+		'model/3mf'
 	]
 };