file-type 11.0.0 → 11.1.0

package/index.d.ts

@@ -9,6 +9,10 @@ declare namespace fileType {
 		| 'webp'
 		| 'flif'
 		| 'cr2'
+		| 'orf'
+		| 'arw'
+		| 'dng'
+		| 'nef'
 		| 'tif'
 		| 'bmp'
 		| 'jxr'

package/index.js

@@ -1,5 +1,5 @@
 'use strict';
-const {stringToBytes, readUInt64LE, tarHeaderChecksumMatches} = require('./util');
+const {stringToBytes, readUInt64LE, tarHeaderChecksumMatches, uint8ArrayUtf8ByteString} = require('./util');
 
 const xpiZipFilename = stringToBytes('META-INF/mozilla.rsa');
 const oxmlContentTypes = stringToBytes('[Content_Types].xml');
@@ -73,7 +73,7 @@ const fileType = input => {
 		};
 	}
 
-	// Needs to be before `tif` check
+	// `cr2`, `orf`, and `arw` need to be before `tif` check
 	if (
 		(check([0x49, 0x49, 0x2A, 0x0]) || check([0x4D, 0x4D, 0x0, 0x2A])) &&
 		check([0x43, 0x52], {offset: 8})
@@ -84,6 +84,34 @@ const fileType = input => {
 		};
 	}
 
+	if (check([0x49, 0x49, 0x52, 0x4F, 0x08, 0x00, 0x00, 0x00, 0x18])) {
+		return {
+			ext: 'orf',
+			mime: 'image/x-olympus-orf'
+		};
+	}
+
+	if (check([0x49, 0x49, 0x2A, 0x00, 0x10, 0xFB, 0x86, 0x01])) {
+		return {
+			ext: 'arw',
+			mime: 'image/x-sony-arw'
+		};
+	}
+
+	if (check([0x49, 0x49, 0x2A, 0x00, 0x08, 0x00, 0x00, 0x00, 0x2D])) {
+		return {
+			ext: 'dng',
+			mime: 'image/x-adobe-dng'
+		};
+	}
+
+	if (check([0x49, 0x49, 0x2A, 0x00, 0x30, 0x3D, 0x72, 0x01, 0x1C])) {
+		return {
+			ext: 'nef',
+			mime: 'image/x-nikon-nef'
+		};
+	}
+
 	if (
 		check([0x49, 0x49, 0x2A, 0x0]) ||
 		check([0x4D, 0x4D, 0x0, 0x2A])
@@ -289,7 +317,7 @@ const fileType = input => {
 	) {
 		// 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 = buffer.toString('utf8', 8, 12);
+		const brandMajor = uint8ArrayUtf8ByteString(buffer, 8, 12);
 		switch (brandMajor) {
 			case 'mif1':
 				return {ext: 'heic', mime: 'image/heif'};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "file-type",
-	"version": "11.0.0",
+	"version": "11.1.0",
 	"description": "Detect the file type of a Buffer/Uint8Array/ArrayBuffer",
 	"license": "MIT",
 	"repository": "sindresorhus/file-type",
@@ -46,6 +46,10 @@
 		"webp",
 		"flif",
 		"cr2",
+		"orf",
+		"arw",
+		"dng",
+		"nef",
 		"tif",
 		"bmp",
 		"jxr",

package/readme.md

@@ -129,7 +129,11 @@ Type: [`stream.Readable`](https://nodejs.org/api/stream.html#stream_class_stream
 - [`gif`](https://en.wikipedia.org/wiki/GIF)
 - [`webp`](https://en.wikipedia.org/wiki/WebP)
 - [`flif`](https://en.wikipedia.org/wiki/Free_Lossless_Image_Format)
-- [`cr2`](https://fileinfo.com/extension/cr2)
+- [`cr2`](https://fileinfo.com/extension/cr2) - Canon Raw image file (v2)
+- [`orf`](https://en.wikipedia.org/wiki/ORF_format) - Olympus Raw image file
+- [`arw`](https://en.wikipedia.org/wiki/Raw_image_format#ARW) - Sony Alpha Raw image file
+- [`dng`](https://en.wikipedia.org/wiki/Digital_Negative) - Adobe Digital Negative image file
+- [`nef`](https://www.nikonusa.com/en/learn-and-explore/a/products-and-innovation/nikon-electronic-format-nef.html) - Nikon Electronic Format image file
 - [`tif`](https://en.wikipedia.org/wiki/Tagged_Image_File_Format)
 - [`bmp`](https://en.wikipedia.org/wiki/BMP_file_format)
 - [`jxr`](https://en.wikipedia.org/wiki/JPEG_XR)
@@ -232,7 +236,7 @@ Type: [`stream.Readable`](https://nodejs.org/api/stream.html#stream_class_stream
 
 *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 request welcome for additional commonly used file types.*
+*Pull requests are welcome for additional commonly used file types.*
 
 
 ## Related

package/util.js

@@ -2,6 +2,10 @@
 
 exports.stringToBytes = string => [...string].map(character => character.charCodeAt(0));
 
+const uint8ArrayUtf8ByteString = (array, start, end) => {
+	return String.fromCharCode(...array.slice(start, end));
+};
+
 exports.readUInt64LE = (buffer, offset = 0) => {
 	let n = buffer[offset];
 	let mul = 1;
@@ -39,7 +43,7 @@ exports.tarHeaderChecksumMatches = buffer => { // Does not check if checksum fie
 		signedBitSum += byte & MASK_8TH_BIT; // Add signed bit to signed bit sum
 	}
 
-	const readSum = parseInt(buffer.toString('utf8', 148, 154), 8); // Read sum in header
+	const readSum = parseInt(uint8ArrayUtf8ByteString(buffer, 148, 154), 8); // Read sum in header
 
 	// Some implementations compute checksum incorrectly using signed bytes
 	return (
@@ -50,3 +54,5 @@ exports.tarHeaderChecksumMatches = buffer => { // Does not check if checksum fie
 		readSum === (sum - (signedBitSum << 1))
 	);
 };
+
+exports.uint8ArrayUtf8ByteString = uint8ArrayUtf8ByteString;