file-type 16.4.0 → 16.5.0

package/browser.js

@@ -1,6 +1,5 @@
 'use strict';
 const {ReadableWebToNodeStream} = require('readable-web-to-node-stream');
-const toBuffer = require('typedarray-to-buffer');
 const core = require('./core');
 
 async function fromStream(stream) {
@@ -11,25 +10,25 @@ async function fromStream(stream) {
 }
 
 async function fromBlob(blob) {
-	const buffer = await convertBlobToBuffer(blob);
-	return core.fromBuffer(buffer);
+	const buffer = await blobToArrayBuffer(blob);
+	return core.fromBuffer(Buffer.from(buffer));
 }
 
 /**
-Convert Web API File to Node Buffer.
+Convert Blobs to ArrayBuffer.
 @param {Blob} blob - Web API Blob.
-@returns {Promise<Buffer>}
+@returns {Promise<ArrayBuffer>}
 */
-function convertBlobToBuffer(blob) {
+function blobToArrayBuffer(blob) {
+	if (blob.arrayBuffer) {
+		return blob.arrayBuffer();
+	}
+
+	// TODO: Remove when stop supporting older environments
 	return new Promise((resolve, reject) => {
 		const fileReader = new FileReader();
 		fileReader.addEventListener('loadend', event => {
-			let data = event.target.result;
-			if (data instanceof ArrayBuffer) {
-				data = toBuffer(new Uint8Array(event.target.result));
-			}
-
-			resolve(data);
+			resolve(event.target.result);
 		});
 
 		fileReader.addEventListener('error', event => {

package/core.d.ts

@@ -140,6 +140,7 @@ declare namespace core {
 		| 'chm'
 		| '3mf'
 		| 'zst'
+		| 'jxl'
 		| 'vcf';
 
 	type MimeType =
@@ -274,6 +275,7 @@ declare namespace core {
 		| 'model/stl'
 		| 'application/vnd.ms-htmlhelp'
 		| 'model/3mf'
+		| 'image/jxl'
 		| 'application/zstd';
 
 	interface FileTypeResult {

package/core.js

@@ -1162,6 +1162,16 @@ async function _fromTokenizer(tokenizer) {
 		}
 	}
 
+	if (
+		check([0xFF, 0x0A]) ||
+		check([0x00, 0x00, 0x00, 0x0C, 0x4A, 0x58, 0x4C, 0x20, 0x0D, 0x0A, 0x87, 0x0A])
+	) {
+		return {
+			ext: 'jxl',
+			mime: 'image/jxl'
+		};
+	}
+
 	// -- Unsafe signatures --
 
 	if (
@@ -1248,7 +1258,7 @@ async function _fromTokenizer(tokenizer) {
 
 	if (check([0x04, 0x00, 0x00, 0x00]) && buffer.length >= 16) { // Rough & quick check Pickle/ASAR
 		const jsonSize = buffer.readUInt32LE(12);
-		if (jsonSize > 12 && jsonSize < 240 && buffer.length >= jsonSize + 16) {
+		if (jsonSize > 12 && buffer.length >= jsonSize + 16) {
 			try {
 				const header = buffer.slice(16, jsonSize + 16).toString();
 				const json = JSON.parse(header);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "file-type",
-	"version": "16.4.0",
+	"version": "16.5.0",
 	"description": "Detect the file type of a Buffer/Uint8Array/ArrayBuffer",
 	"license": "MIT",
 	"repository": "sindresorhus/file-type",
@@ -184,6 +184,7 @@
 		"chm",
 		"3mf",
 		"zst",
+		"jxl",
 		"vcf"
 	],
 	"devDependencies": {
@@ -197,8 +198,7 @@
 	"dependencies": {
 		"readable-web-to-node-stream": "^3.0.0",
 		"strtok3": "^6.0.3",
-		"token-types": "^2.0.0",
-		"typedarray-to-buffer": "^3.1.5"
+		"token-types": "^2.0.0"
 	},
 	"xo": {
 		"envs": [

package/readme.md

@@ -409,6 +409,7 @@ Returns a set of supported MIME types.
 - [`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
+- [`jxl`](https://en.wikipedia.org/wiki/JPEG_XL) - JPEG XL image format
 
 *Pull requests are welcome for additional commonly used file types.*
 

package/supported.js

@@ -138,6 +138,7 @@ module.exports = {
 		'chm',
 		'3mf',
 		'zst',
+		'jxl',
 		'vcf'
 	],
 	mimeTypes: [
@@ -272,6 +273,7 @@ module.exports = {
 		'model/stl',
 		'application/vnd.ms-htmlhelp',
 		'model/3mf',
+		'image/jxl',
 		'application/zstd'
 	]
 };