file-type 17.1.6 → 18.1.0

package/browser.d.ts

@@ -1,4 +1,4 @@
-import {FileTypeResult} from './core.js';
+import type {FileTypeResult} from './core.js';
 
 /**
 Detect the file type of a [`ReadableStream`](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStream).
@@ -42,7 +42,7 @@ export {
 	fileTypeFromBuffer,
 	supportedExtensions,
 	supportedMimeTypes,
-	FileTypeResult,
-	FileExtension,
-	MimeType,
+	type FileTypeResult,
+	type FileExtension,
+	type MimeType,
 } from './core.js';

package/core.d.ts

@@ -1,5 +1,5 @@
-import {Readable as ReadableStream} from 'node:stream';
-import {ITokenizer} from 'strtok3';
+import type {Readable as ReadableStream} from 'node:stream';
+import type {ITokenizer} from 'strtok3';
 
 export type FileExtension =
 	| 'jpg'
@@ -140,7 +140,10 @@ export type FileExtension =
 	| '3mf'
 	| 'zst'
 	| 'jxl'
-	| 'vcf';
+	| 'vcf'
+	| 'jls'
+	| 'pst'
+	| 'dwg';
 
 export type MimeType =
 	| 'image/jpeg'
@@ -276,9 +279,12 @@ export type MimeType =
 	| 'application/vnd.ms-htmlhelp'
 	| 'model/3mf'
 	| 'image/jxl'
-	| 'application/zstd';
+	| 'application/zstd'
+	| 'image/jls'
+	| 'application/vnd.ms-outlook'
+	| 'image/vnd.dwg';
 
-export interface FileTypeResult {
+export type FileTypeResult = {
 	/**
 	One of the supported [file types](https://github.com/sindresorhus/file-type#supported-file-types).
 	*/
@@ -288,7 +294,7 @@ export interface FileTypeResult {
 	The detected [MIME type](https://en.wikipedia.org/wiki/Internet_media_type).
 	*/
 	readonly mime: MimeType;
-}
+};
 
 export type ReadableStreamWithFileType = ReadableStream & {
 	readonly fileType?: FileTypeResult;
@@ -354,14 +360,14 @@ Supported MIME types.
 */
 export const supportedMimeTypes: ReadonlySet<MimeType>;
 
-export interface StreamOptions {
+export type StreamOptions = {
 	/**
 	The default sample size in bytes.
 
 	@default 4100
 	*/
 	readonly sampleSize?: number;
-}
+};
 
 /**
 Returns a `Promise` which resolves to the original readable stream argument, but with an added `fileType` property, which is an object like the one returned from `fileTypeFromFile()`.
@@ -387,7 +393,7 @@ const url = 'https://upload.wikimedia.org/wikipedia/en/a/a9/Example.jpg';
 const stream1 = got.stream(url);
 const stream2 = await fileTypeStream(stream1, {sampleSize: 1024});
 
-if (stream2.fileType && stream2.fileType.mime === 'image/jpeg') {
+if (stream2.fileType?.mime === 'image/jpeg') {
 	// stream2 can be used to stream the JPEG image (from the very beginning of the stream)
 }
 ```

package/core.js

@@ -1,6 +1,6 @@
 import {Buffer} from 'node:buffer';
 import * as Token from 'token-types';
-import * as strtok3 from 'strtok3/core';
+import * as strtok3 from 'strtok3/core'; // eslint-disable-line n/file-extension-in-import
 import {
 	stringToBytes,
 	tarHeaderChecksumMatches,
@@ -26,7 +26,7 @@ export async function fileTypeFromBuffer(input) {
 
 	const buffer = input instanceof Uint8Array ? input : new Uint8Array(input);
 
-	if (!(buffer && buffer.length > 1)) {
+	if (!(buffer?.length > 1)) {
 		return;
 	}
 
@@ -159,13 +159,6 @@ class FileTypeParser {
 			};
 		}
 
-		if (this.check([0xFF, 0xD8, 0xFF])) {
-			return {
-				ext: 'jpg',
-				mime: 'image/jpeg',
-			};
-		}
-
 		if (this.check([0x49, 0x49, 0xBC])) {
 			return {
 				ext: 'jxr',
@@ -222,6 +215,21 @@ class FileTypeParser {
 
 		// -- 4-byte signatures --
 
+		// Requires a sample size of 4 bytes
+		if (this.check([0xFF, 0xD8, 0xFF])) {
+			if (this.check([0xF7], {offset: 3})) { // JPG7/SOF55, indicating a ISO/IEC 14495 / JPEG-LS file
+				return {
+					ext: 'jls',
+					mime: 'image/jls',
+				};
+			}
+
+			return {
+				ext: 'jpg',
+				mime: 'image/jpeg',
+			};
+		}
+
 		if (this.checkString('FLIF')) {
 			return {
 				ext: 'flif',
@@ -337,7 +345,8 @@ class FileTypeParser {
 					// - one entry indicating specific type of file.
 					// MS Office, OpenOffice and LibreOffice may put the parts in different order, so the check should not rely on it.
 					if (zipHeader.filename === 'mimetype' && zipHeader.compressedSize === zipHeader.uncompressedSize) {
-						const mimeType = (await tokenizer.readToken(new Token.StringType(zipHeader.compressedSize, 'utf-8'))).trim();
+						let mimeType = await tokenizer.readToken(new Token.StringType(zipHeader.compressedSize, 'utf-8'));
+						mimeType = mimeType.trim();
 
 						switch (mimeType) {
 							case 'application/epub+zip':
@@ -799,6 +808,13 @@ class FileTypeParser {
 			};
 		}
 
+		if (this.check([0x21, 0x42, 0x44, 0x4E])) {
+			return {
+				ext: 'pst',
+				mime: 'application/vnd.ms-outlook',
+			};
+		}
+
 		// -- 5-byte signatures --
 
 		if (this.check([0x4F, 0x54, 0x54, 0x4F, 0x00])) {
@@ -922,6 +938,16 @@ class FileTypeParser {
 			};
 		}
 
+		if (this.checkString('AC')) {
+			const version = this.buffer.toString('binary', 2, 6);
+			if (version.match('^d*') && version >= 1000 && version <= 1050) {
+				return {
+					ext: 'dwg',
+					mime: 'image/vnd.dwg',
+				};
+			}
+		}
+
 		// -- 7-byte signatures --
 
 		if (this.checkString('BLENDER')) {
@@ -1482,8 +1508,8 @@ class FileTypeParser {
 			}
 
 			await this.tokenizer.ignore(ifdOffset);
-			const fileType = await this.readTiffIFD(false);
-			return fileType ? fileType : {
+			const fileType = await this.readTiffIFD(bigEndian);
+			return fileType ?? {
 				ext: 'tif',
 				mime: 'image/tiff',
 			};
@@ -1499,7 +1525,6 @@ class FileTypeParser {
 }
 
 export async function fileTypeStream(readableStream, {sampleSize = minimumBytes} = {}) {
-	// eslint-disable-next-line node/no-unsupported-features/es-syntax
 	const {default: stream} = await import('node:stream');
 
 	return new Promise((resolve, reject) => {
@@ -1513,7 +1538,7 @@ export async function fileTypeStream(readableStream, {sampleSize = minimumBytes}
 					const outputStream = stream.pipeline ? stream.pipeline(readableStream, pass, () => {}) : readableStream.pipe(pass);
 
 					// Read the input stream and detect the filetype
-					const chunk = readableStream.read(sampleSize) || readableStream.read() || Buffer.alloc(0);
+					const chunk = readableStream.read(sampleSize) ?? readableStream.read() ?? Buffer.alloc(0);
 					try {
 						const fileType = await fileTypeFromBuffer(chunk);
 						pass.fileType = fileType;

package/index.d.ts

@@ -1,5 +1,4 @@
-import {Readable as ReadableStream} from 'node:stream';
-import {FileTypeResult} from './core.js';
+import type {FileTypeResult} from './core.js';
 
 /**
 Detect the file type of a file path.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "file-type",
-	"version": "17.1.6",
+	"version": "18.1.0",
 	"description": "Detect the file type of a Buffer/Uint8Array/ArrayBuffer",
 	"license": "MIT",
 	"repository": "sindresorhus/file-type",
@@ -19,7 +19,7 @@
 		"./core": "./core.js"
 	},
 	"engines": {
-		"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+		"node": ">=14.16"
 	},
 	"scripts": {
 		"test": "xo && ava && tsd"
@@ -193,22 +193,24 @@
 		"3mf",
 		"zst",
 		"jxl",
-		"vcf"
+		"vcf",
+		"jls",
+		"pst",
+		"dwg"
 	],
 	"dependencies": {
 		"readable-web-to-node-stream": "^3.0.2",
-		"strtok3": "^7.0.0-alpha.9",
-		"token-types": "^5.0.0-alpha.2"
+		"strtok3": "^7.0.0",
+		"token-types": "^5.0.1"
 	},
 	"devDependencies": {
 		"@tokenizer/token": "^0.3.0",
-		"@types/node": "^16.11.10",
-		"ava": "^3.15.0",
+		"@types/node": "^18.7.13",
+		"ava": "^5.1.0",
 		"commonmark": "^0.30.0",
 		"noop-stream": "^1.0.0",
-		"tsd": "^0.19.0",
-		"typescript": "^4.5.2",
-		"xo": "^0.46.4"
+		"tsd": "^0.25.0",
+		"xo": "^0.53.1"
 	},
 	"xo": {
 		"envs": [
@@ -219,11 +221,13 @@
 			"no-inner-declarations": "warn",
 			"no-await-in-loop": "warn",
 			"no-bitwise": "off",
-			"@typescript-eslint/no-unsafe-assignment": "off"
+			"@typescript-eslint/no-unsafe-assignment": "off",
+			"unicorn/text-encoding-identifier-case": "off",
+			"unicorn/switch-case-braces": "off",
+			"unicorn/prefer-top-level-await": "off"
 		}
 	},
 	"ava": {
-		"serial": true,
-		"verbose": true
+		"serial": true
 	}
 }

package/readme.md

@@ -318,7 +318,7 @@ const url = 'https://upload.wikimedia.org/wikipedia/en/a/a9/Example.jpg';
 const stream1 = got.stream(url);
 const stream2 = await fileTypeStream(stream1, {sampleSize: 1024});
 
-if (stream2.fileType && stream2.fileType.mime === 'image/jpeg') {
+if (stream2.fileType?.mime === 'image/jpeg') {
 	// stream2 can be used to stream the JPEG image (from the very beginning of the stream)
 }
 ```
@@ -376,6 +376,7 @@ Returns a `Set<string>` of supported MIME types.
 - [`dng`](https://en.wikipedia.org/wiki/Digital_Negative) - Adobe Digital Negative image file
 - [`docx`](https://en.wikipedia.org/wiki/Office_Open_XML) - Microsoft Word
 - [`dsf`](https://dsd-guide.com/sites/default/files/white-papers/DSFFileFormatSpec_E.pdf) - Sony DSD Stream File (DSF)
+- [`dwg`](https://en.wikipedia.org/wiki/.dwg) - Autodesk CAD file
 - [`elf`](https://en.wikipedia.org/wiki/Executable_and_Linkable_Format) - Unix Executable and Linkable Format
 - [`eot`](https://en.wikipedia.org/wiki/Embedded_OpenType) - Embedded OpenType font
 - [`eps`](https://en.wikipedia.org/wiki/Encapsulated_PostScript) - Encapsulated PostScript
@@ -397,6 +398,7 @@ Returns a `Set<string>` of supported MIME types.
 - [`ics`](https://en.wikipedia.org/wiki/ICalendar#Data_format) - iCalendar
 - [`indd`](https://en.wikipedia.org/wiki/Adobe_InDesign#File_format) - Adobe InDesign document
 - [`it`](https://wiki.openmpt.org/Manual:_Module_formats#The_Impulse_Tracker_format_.28.it.29) - Audio module format: Impulse Tracker
+- [`jls`](https://en.wikipedia.org/wiki/Lossless_JPEG#JPEG-LS) - Lossless/near-lossless compression standard for continuous-tone images
 - [`jp2`](https://en.wikipedia.org/wiki/JPEG_2000) - JPEG 2000
 - [`jpg`](https://en.wikipedia.org/wiki/JPEG) - Joint Photographic Experts Group image
 - [`jpm`](https://en.wikipedia.org/wiki/JPEG_2000) - JPEG 2000
@@ -410,7 +412,7 @@ Returns a `Set<string>` of supported MIME types.
 - [`m4a`](https://en.wikipedia.org/wiki/M4A) - Audio-only MPEG-4 files
 - [`m4b`](https://en.wikipedia.org/wiki/M4B) - Audiobook and podcast MPEG-4 files, which also contain metadata including chapter markers, images, and hyperlinks
 - [`m4p`](https://en.wikipedia.org/wiki/MPEG-4_Part_14#Filename_extensions) - MPEG-4 files with audio streams encrypted by FairPlay Digital Rights Management as were sold through the iTunes Store
-- [`m4v`](https://en.wikipedia.org/wiki/M4V) -  MPEG-4 Visual bitstreams
+- [`m4v`](https://en.wikipedia.org/wiki/M4V) - Video container format developed by Apple, which is very similar to the MP4 format
 - [`mid`](https://en.wikipedia.org/wiki/MIDI) - Musical Instrument Digital Interface file
 - [`mie`](https://en.wikipedia.org/wiki/Sidecar_file) - Dedicated meta information format which supports storage of binary as well as textual meta information
 - [`mj2`](https://en.wikipedia.org/wiki/Motion_JPEG_2000) - Motion JPEG 2000
@@ -445,6 +447,7 @@ Returns a `Set<string>` of supported MIME types.
 - [`pptx`](https://en.wikipedia.org/wiki/Office_Open_XML) - Microsoft Powerpoint
 - [`ps`](https://en.wikipedia.org/wiki/Postscript) - Postscript
 - [`psd`](https://en.wikipedia.org/wiki/Adobe_Photoshop#File_format) - Adobe Photoshop document
+- [`pst`](https://en.wikipedia.org/wiki/Personal_Storage_Table) - Personal Storage Table file
 - [`qcp`](https://en.wikipedia.org/wiki/QCP) - Tagged and chunked data
 - [`raf`](https://en.wikipedia.org/wiki/Raw_image_format) - Fujifilm RAW image file
 - [`rar`](https://en.wikipedia.org/wiki/RAR_(file_format)) - Archive file
@@ -490,12 +493,6 @@ The following file types will not be accepted:
 - `.csv` - [Reason.](https://github.com/sindresorhus/file-type/issues/264#issuecomment-568439196)
 - `.svg` - Detecting it requires a full-blown parser. Check out [`is-svg`](https://github.com/sindresorhus/is-svg) for something that mostly works.
 
-## 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
@@ -503,6 +500,9 @@ The maintainers of file-type and thousands of other packages are working with Ti
 ## Maintainers
 
 - [Sindre Sorhus](https://github.com/sindresorhus)
+- [Borewit](https://github.com/Borewit)
+
+**Former**
+
 - [Mikael Finstad](https://github.com/mifi)
 - [Ben Brook](https://github.com/bencmbrook)
-- [Borewit](https://github.com/Borewit)

package/supported.js

@@ -138,6 +138,9 @@ export const extensions = [
 	'zst',
 	'jxl',
 	'vcf',
+	'jls',
+	'pst',
+	'dwg',
 ];
 
 export const mimeTypes = [
@@ -275,4 +278,7 @@ export const mimeTypes = [
 	'model/3mf',
 	'image/jxl',
 	'application/zstd',
+	'image/jls',
+	'application/vnd.ms-outlook',
+	'image/vnd.dwg',
 ];

package/util.js

@@ -1,5 +1,5 @@
 export function stringToBytes(string) {
-	return [...string].map(character => character.charCodeAt(0));
+	return [...string].map(character => character.charCodeAt(0)); // eslint-disable-line unicorn/prefer-code-point
 }
 
 /**
@@ -17,12 +17,12 @@ export function tarHeaderChecksumMatches(buffer, offset = 0) {
 
 	let sum = 8 * 0x20; // Initialize signed bit sum
 
-	for (let i = offset; i < offset + 148; i++) {
-		sum += buffer[i];
+	for (let index = offset; index < offset + 148; index++) {
+		sum += buffer[index];
 	}
 
-	for (let i = offset + 156; i < offset + 512; i++) {
-		sum += buffer[i];
+	for (let index = offset + 156; index < offset + 512; index++) {
+		sum += buffer[index];
 	}
 
 	return readSum === sum;