file-type 12.3.0 → 12.4.2

package/index.d.ts

@@ -118,7 +118,9 @@ declare namespace fileType {
 		| 'ogm'
 		| 'oga'
 		| 'spx'
-		| 'ogx';
+		| 'ogx'
+		| 'arrow'
+		| 'shp';
 
 	type MimeType =
 		| 'image/jpeg'
@@ -194,6 +196,7 @@ declare namespace fileType {
 		| 'application/x-lzip'
 		| 'application/x-msi'
 		| 'application/x-mie'
+		| 'application/x-apache-arrow'
 		| 'application/mxf'
 		| 'video/mp2t'
 		| 'application/x-blender'
@@ -229,7 +232,8 @@ declare namespace fileType {
 		| 'image/x-panasonic-rw2'
 		| 'image/x-fujifilm-raf'
 		| 'video/x-m4v'
-		| 'video/3gpp2';
+		| 'video/3gpp2'
+		| 'application/x-esri-shape';
 
 	interface FileTypeResult {
 		/**
@@ -292,12 +296,12 @@ declare const fileType: {
 	/**
 	Supported file extensions.
 	*/
-	readonly extensions: fileType.FileType;
+	readonly extensions: readonly fileType.FileType[];
 
 	/**
 	Supported MIME types.
 	*/
-	readonly mimeTypes: fileType.MimeType;
+	readonly mimeTypes: readonly fileType.MimeType[];
 
 	/**
 	Detect the file type of a readable stream.

package/index.js

@@ -119,9 +119,9 @@ const fileType = input => {
 
 	if (
 		check([0x49, 0x49, 0x2A, 0x00]) &&
-		(check([0x10, 0xFB, 0x86, 0x01], {offset: 4}) ||
-		check([0x08, 0x00, 0x00, 0x00, 0x13, 0x00], {offset: 4}) ||
-		check([0x08, 0x00, 0x00, 0x00, 0x12, 0x00], {offset: 4}))
+		(check([0x10, 0xFB, 0x86, 0x01], {offset: 4}) || check([0x08, 0x00, 0x00, 0x00], {offset: 4})) &&
+		// This pattern differentiates ARW from other TIFF-ish file types:
+		check([0x00, 0xFE, 0x00, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x01], {offset: 9})
 	) {
 		return {
 			ext: 'arw',
@@ -364,12 +364,12 @@ const fileType = input => {
 	// `ftyp` box must contain a brand major identifier, which must consist of ISO 8859-1 printable characters.
 	// Here we check for 8859-1 printable characters (for simplicity, it's a mask which also catches one non-printable character).
 	if (
-		check([0x66, 0x74, 0x79, 0x70], {offset: 4}) && // `ftyp`
-		(buffer[8] & 0x60) !== 0x00 && (buffer[9] & 0x60) !== 0x00 && (buffer[10] & 0x60) !== 0x00 && (buffer[11] & 0x60) !== 0x00 // Brand major
+		checkString('ftyp', {offset: 4}) &&
+		(buffer[8] & 0x60) !== 0x00 // Brand major, first character ASCII?
 	) {
 		// They all can have MIME `video/mp4` except `application/mp4` special-case which is hard to detect.
 		// For some cases, we're specific, everything else falls to `video/mp4` with `mp4` extension.
-		const brandMajor = uint8ArrayUtf8ByteString(buffer, 8, 12);
+		const brandMajor = uint8ArrayUtf8ByteString(buffer, 8, 12).replace('\0', ' ').trim();
 		switch (brandMajor) {
 			case 'mif1':
 				return {ext: 'heic', mime: 'image/heif'};
@@ -379,23 +379,23 @@ const fileType = input => {
 				return {ext: 'heic', mime: 'image/heic'};
 			case 'hevc': case 'hevx':
 				return {ext: 'heic', mime: 'image/heic-sequence'};
-			case 'qt  ':
+			case 'qt':
 				return {ext: 'mov', mime: 'video/quicktime'};
-			case 'M4V ': case 'M4VH': case 'M4VP':
+			case 'M4V': case 'M4VH': case 'M4VP':
 				return {ext: 'm4v', mime: 'video/x-m4v'};
-			case 'M4P ':
+			case 'M4P':
 				return {ext: 'm4p', mime: 'video/mp4'};
-			case 'M4B ':
+			case 'M4B':
 				return {ext: 'm4b', mime: 'audio/mp4'};
-			case 'M4A ':
+			case 'M4A':
 				return {ext: 'm4a', mime: 'audio/x-m4a'};
-			case 'F4V ':
+			case 'F4V':
 				return {ext: 'f4v', mime: 'video/mp4'};
-			case 'F4P ':
+			case 'F4P':
 				return {ext: 'f4p', mime: 'video/mp4'};
-			case 'F4A ':
+			case 'F4A':
 				return {ext: 'f4a', mime: 'audio/mp4'};
-			case 'F4B ':
+			case 'F4B':
 				return {ext: 'f4b', mime: 'audio/mp4'};
 			default:
 				if (brandMajor.startsWith('3g')) {
@@ -1020,6 +1020,20 @@ const fileType = input => {
 			mime: 'application/x-mie'
 		};
 	}
+
+	if (check([0x41, 0x52, 0x52, 0x4F, 0x57, 0x31, 0x00, 0x00])) {
+		return {
+			ext: 'arrow',
+			mime: 'application/x-apache-arrow'
+		};
+	}
+
+	if (check([0x27, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], {offset: 2})) {
+		return {
+			ext: 'shp',
+			mime: 'application/x-esri-shape'
+		};
+	}
 };
 
 module.exports = fileType;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "file-type",
-	"version": "12.3.0",
+	"version": "12.4.2",
 	"description": "Detect the file type of a Buffer/Uint8Array/ArrayBuffer",
 	"license": "MIT",
 	"repository": "sindresorhus/file-type",
@@ -156,7 +156,9 @@
 		"crx",
 		"ktx",
 		"dcm",
-		"mpc"
+		"mpc",
+		"arrow",
+		"shp"
 	],
 	"devDependencies": {
 		"@types/node": "^12.7.2",

package/readme.md

@@ -29,18 +29,18 @@ fileType(buffer);
 Or from a remote location:
 
 ```js
-const http = require('http');
+const https = require('https');
 const fileType = require('file-type');
 
-const url = 'https://assets-cdn.github.com/images/spinners/octocat-spinner-32.gif';
+const url = 'https://upload.wikimedia.org/wikipedia/en/a/a9/Example.jpg';
 
-http.get(url, response => {
+https.get(url, response => {
 	response.on('readable', () => {
 		const chunk = response.read(fileType.minimumBytes);
 		response.destroy();
 
 		console.log(fileType(chunk));
-		//=> {ext: 'gif', mime: 'image/gif'}
+		//=> {ext: 'jpg', mime: 'image/jpeg'}
 	});
 });
 ```
@@ -57,13 +57,13 @@ const fileType = require('file-type');
 	const read = fs.createReadStream('encrypted.enc');
 	const decipher = crypto.createDecipheriv(alg, key, iv);
 
-	const stream = await fileType.stream(stream.pipeline(read, decipher));
+	const fileTypeStream = await fileType.stream(stream.pipeline(read, decipher));
 
-	console.log(stream.fileType);
+	console.log(fileTypeStream.fileType);
 	//=> {ext: 'mov', mime: 'video/quicktime'}
 
-	const write = fs.createWriteStream(`decrypted.${stream.fileType.ext}`);
-	stream.pipe(write);
+	const write = fs.createWriteStream(`decrypted.${fileTypeStream.fileType.ext}`);
+	fileTypeStream.pipe(write);
 })();
 ```
 
@@ -245,13 +245,22 @@ Returns a set of supported MIME types.
 - [`f4p`](https://en.wikipedia.org/wiki/Flash_Video) - ISO base media file format protected by Adobe Access DRM used by Adobe Flash Player
 - [`f4a`](https://en.wikipedia.org/wiki/Flash_Video) - Audio-only ISO base media file format used by Adobe Flash Player
 - [`f4b`](https://en.wikipedia.org/wiki/Flash_Video) - Audiobook and podcast ISO base media file format used by Adobe Flash Player
-- [`mie`](https://en.wikipedia.org/wiki/Sidecar_file) - Dedicated meta information format which supports storage of binary as well as textual meta information.
+- [`mie`](https://en.wikipedia.org/wiki/Sidecar_file) - Dedicated meta information format which supports storage of binary as well as textual meta information
+- [`shp`](https://en.wikipedia.org/wiki/Shapefile) - Geospatial vector data format
+- [`arrow`](https://arrow.apache.org) - Columnar format for tables of data
 
 *SVG isn't included as it requires the whole file to be read, but you can get it [here](https://github.com/sindresorhus/is-svg).*
 
 *Pull requests are welcome for additional commonly used file types, except for `doc`, `xls`, `ppt`.*
 
 
+## file-type for enterprise
+
+Available as part of the Tidelift Subscription.
+
+The maintainers of file-type and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use. [Learn more.](https://tidelift.com/subscription/pkg/npm-file-type?utm_source=npm-file-type&utm_medium=referral&utm_campaign=enterprise&utm_term=repo)
+
+
 ## Related
 
 - [file-type-cli](https://github.com/sindresorhus/file-type-cli) - CLI for this module
@@ -262,16 +271,3 @@ Returns a set of supported MIME types.
 - [Sindre Sorhus](https://github.com/sindresorhus)
 - [Mikael Finstad](https://github.com/mifi)
 - [Ben Brook](https://github.com/bencmbrook)
-
-
----
-
-<div align="center">
-	<b>
-		<a href="https://tidelift.com/subscription/pkg/npm-file-type?utm_source=npm-file-type&utm_medium=referral&utm_campaign=readme">Get professional support for this package with a Tidelift subscription</a>
-	</b>
-	<br>
-	<sub>
-		Tidelift helps make open source sustainable for maintainers while giving companies<br>assurances about security, maintenance, and licensing for their dependencies.
-	</sub>
-</div>

package/supported.js

@@ -117,7 +117,9 @@ module.exports = {
 		'asf',
 		'ogm',
 		'ogx',
-		'mpc'
+		'mpc',
+		'arrow',
+		'shp'
 	],
 	mimeTypes: [
 		'image/jpeg',
@@ -145,6 +147,7 @@ module.exports = {
 		'application/x-bzip2',
 		'application/x-7z-compressed',
 		'application/x-apple-diskimage',
+		'application/x-apache-arrow',
 		'video/mp4',
 		'audio/midi',
 		'video/x-matroska',
@@ -228,6 +231,7 @@ module.exports = {
 		'image/x-panasonic-rw2',
 		'image/x-fujifilm-raf',
 		'video/x-m4v',
-		'video/3gpp2'
+		'video/3gpp2',
+		'application/x-esri-shape'
 	]
 };