read-excel-file 9.0.6 → 9.0.7

package/modules/xlsx/parseSpreadsheetContents.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseSpreadsheetContents.js","names":["parseSpreadsheetInfo","parseFilePaths","parseStyles","parseSharedStrings","parseSheet","parseSpreadsheetContents","contents","xml","options","arguments","length","undefined","getFileContent","filePath","Error","concat","filePaths","sharedStrings","styles","_parseSpreadsheetInfo","sheets","epoch1904","sheetIdsToRead","map","sheet","getSheetId","sheetsData","_i","_Object$keys","Object","keys","sheetId","includes","push","getSheetNameById","data","_iterator","_createForOfIteratorHelperLoose","_step","done","_sheet","value","name","relationId","_ref","join","_iterator2","_step2"],"sources":["../../source/xlsx/parseSpreadsheetContents.js"],"sourcesContent":["import parseSpreadsheetInfo from './parseSpreadsheetInfo.js'\r\nimport parseFilePaths from './parseFilePaths.js'\r\nimport parseStyles from './parseStyles.js'\r\nimport parseSharedStrings from './parseSharedStrings.js'\r\nimport parseSheet from './parseSheet.js'\r\n\r\n// For an introduction in reading `.xlsx` files see \"The minimum viable XLSX reader\":\r\n// https://www.brendanlong.com/the-minimum-viable-xlsx-reader.html\r\n\r\n/**\r\n * Reads data from an `.xlsx` file.\r\n * @param  {Record<string,string>} contents - A map of `.xml` files inside the `.xlsx` file (which itself is just a zipped directory).\r\n * @param  {object} xml — An object having a single property — `createDocument(string)` function.\r\n * @param  {object} [options]\r\n * @return {ReadFileResult}\r\n */\r\nexport default function parseSpreadsheetContents(contents, xml, options = {}) {\r\n  const getFileContent = (filePath) => {\r\n    if (!contents[filePath]) {\r\n      throw new Error(`\"${filePath}\" file not found inside the *.xlsx file zip archive`)\r\n    }\r\n    return contents[filePath]\r\n  }\r\n\r\n  // Read the paths to certain files inside the `.xlsx` file, which is itself just a `.zip` archive.\r\n  // These paths aren't standardized between different spreadsheet editors.\r\n  // https://github.com/tidyverse/readxl/issues/104\r\n  const filePaths = parseFilePaths(getFileContent('xl/_rels/workbook.xml.rels'), xml)\r\n\r\n  // The usual file path for \"shared strings\" is \"xl/sharedStrings.xml\".\r\n  const sharedStrings = filePaths.sharedStrings\r\n    ? parseSharedStrings(getFileContent(filePaths.sharedStrings), xml)\r\n    : []\r\n\r\n  // The usual file path for \"styles\" is \"xl/styles.xml\".\r\n  const styles = filePaths.styles\r\n    ? parseStyles(getFileContent(filePaths.styles), xml)\r\n    : {}\r\n\r\n  const { sheets, epoch1904 } = parseSpreadsheetInfo(getFileContent('xl/workbook.xml'), xml)\r\n\r\n  const sheetIdsToRead = options.sheets && options.sheets.map(sheet => getSheetId(sheet, sheets))\r\n\r\n  // Parse sheets data.\r\n\r\n  const sheetsData = []\r\n\r\n  for (const sheetId of Object.keys(filePaths.sheets)) {\r\n    if (sheetIdsToRead && !sheetIdsToRead.includes(sheetId)) {\r\n      continue\r\n    }\r\n\r\n    sheetsData.push({\r\n      sheet: getSheetNameById(sheetId, sheets),\r\n      data: parseSheet(\r\n        getFileContent(filePaths.sheets[sheetId]),\r\n        xml,\r\n        sharedStrings,\r\n        styles,\r\n        epoch1904,\r\n        options\r\n      )\r\n    })\r\n  }\r\n\r\n  // Return spreadsheet data.\r\n  return sheetsData\r\n}\r\n\r\nfunction getSheetId(sheet, sheets) {\r\n  if (typeof sheet === 'string') {\r\n    for (const _sheet of sheets) {\r\n      if (_sheet.name === sheet) {\r\n        return _sheet.relationId\r\n      }\r\n    }\r\n\t\tthrow new Error(`Sheet \"${sheet}\" not found. Available sheets: ${sheets.map(({ name }) => `\"${name}\"`).join(', ')}`)\r\n  } else {\r\n\t\tif (sheet <= sheets.length) {\r\n      return sheets[sheet - 1].relationId\r\n    }\r\n    throw new Error(`Sheet number out of bounds: ${sheet}. Available sheets count: ${sheets.length}`)\r\n  }\r\n}\r\n\r\nfunction getSheetNameById(sheetId, sheets) {\r\n  for (const sheet of sheets) {\r\n    if (sheet.relationId === sheetId) {\r\n      return sheet.name\r\n    }\r\n  }\r\n  throw new Error(`Sheet ID not found: ${sheetId}`)\r\n}"],"mappings":"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"}
+{"version":3,"file":"parseSpreadsheetContents.js","names":["parseSpreadsheetInfo","parseFilePaths","parseStyles","parseSharedStrings","parseSheet","parseSpreadsheetContents","contents","xml","options","arguments","length","undefined","getFileContent","filePath","Error","concat","filePaths","sharedStrings","styles","_parseSpreadsheetInfo","sheets","epoch1904","sheetIdsToRead","map","sheet","getSheetId","sheetsData","_i","_Object$keys","Object","keys","sheetId","includes","push","getSheetNameById","data","_iterator","_createForOfIteratorHelperLoose","_step","done","_sheet","value","name","relationId","_ref","join","_iterator2","_step2"],"sources":["../../source/xlsx/parseSpreadsheetContents.js"],"sourcesContent":["import parseSpreadsheetInfo from './parseSpreadsheetInfo.js'\r\nimport parseFilePaths from './parseFilePaths.js'\r\nimport parseStyles from './parseStyles.js'\r\nimport parseSharedStrings from './parseSharedStrings.js'\r\nimport parseSheet from './parseSheet.js'\r\n\r\n// For an introduction in reading `.xlsx` files see \"The minimum viable XLSX reader\":\r\n// https://www.brendanlong.com/the-minimum-viable-xlsx-reader.html\r\n\r\n/**\r\n * Reads data from an `.xlsx` file.\r\n * @param  {Record<string,string>} contents - A map of `.xml` files inside the `.xlsx` file (which itself is just a zipped directory).\r\n * @param  {object} xml — An object having a single property — `createDocument(string)` function.\r\n * @param  {object} [options]\r\n * @return {Sheet[]}\r\n */\r\nexport default function parseSpreadsheetContents(contents, xml, options = {}) {\r\n  const getFileContent = (filePath) => {\r\n    if (!contents[filePath]) {\r\n      throw new Error(`\"${filePath}\" file not found inside the *.xlsx file zip archive`)\r\n    }\r\n    return contents[filePath]\r\n  }\r\n\r\n  // Read the paths to certain files inside the `.xlsx` file, which is itself just a `.zip` archive.\r\n  // These paths aren't standardized between different spreadsheet editors.\r\n  // https://github.com/tidyverse/readxl/issues/104\r\n  const filePaths = parseFilePaths(getFileContent('xl/_rels/workbook.xml.rels'), xml)\r\n\r\n  // The usual file path for \"shared strings\" is \"xl/sharedStrings.xml\".\r\n  const sharedStrings = filePaths.sharedStrings\r\n    ? parseSharedStrings(getFileContent(filePaths.sharedStrings), xml)\r\n    : []\r\n\r\n  // The usual file path for \"styles\" is \"xl/styles.xml\".\r\n  const styles = filePaths.styles\r\n    ? parseStyles(getFileContent(filePaths.styles), xml)\r\n    : {}\r\n\r\n  const { sheets, epoch1904 } = parseSpreadsheetInfo(getFileContent('xl/workbook.xml'), xml)\r\n\r\n  const sheetIdsToRead = options.sheets && options.sheets.map(sheet => getSheetId(sheet, sheets))\r\n\r\n  // Parse sheets data.\r\n\r\n  const sheetsData = []\r\n\r\n  for (const sheetId of Object.keys(filePaths.sheets)) {\r\n    if (sheetIdsToRead && !sheetIdsToRead.includes(sheetId)) {\r\n      continue\r\n    }\r\n\r\n    sheetsData.push({\r\n      sheet: getSheetNameById(sheetId, sheets),\r\n      data: parseSheet(\r\n        getFileContent(filePaths.sheets[sheetId]),\r\n        xml,\r\n        sharedStrings,\r\n        styles,\r\n        epoch1904,\r\n        options\r\n      )\r\n    })\r\n  }\r\n\r\n  // Return spreadsheet data.\r\n  return sheetsData\r\n}\r\n\r\nfunction getSheetId(sheet, sheets) {\r\n  if (typeof sheet === 'string') {\r\n    for (const _sheet of sheets) {\r\n      if (_sheet.name === sheet) {\r\n        return _sheet.relationId\r\n      }\r\n    }\r\n\t\tthrow new Error(`Sheet \"${sheet}\" not found. Available sheets: ${sheets.map(({ name }) => `\"${name}\"`).join(', ')}`)\r\n  } else {\r\n\t\tif (sheet <= sheets.length) {\r\n      return sheets[sheet - 1].relationId\r\n    }\r\n    throw new Error(`Sheet number out of bounds: ${sheet}. Available sheets count: ${sheets.length}`)\r\n  }\r\n}\r\n\r\nfunction getSheetNameById(sheetId, sheets) {\r\n  for (const sheet of sheets) {\r\n    if (sheet.relationId === sheetId) {\r\n      return sheet.name\r\n    }\r\n  }\r\n  throw new Error(`Sheet ID not found: ${sheetId}`)\r\n}"],"mappings":"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"}

package/node/index.d.ts

@@ -1,35 +1,48 @@
 // The contents of this file is identical between the different exports:
 // `/node`, `/browser`, etc.
 
-import { Input } from './input.d.js'
+import type { Input } from './input.d.js'
 
-import {
-	SheetData,
-	ReadOptions,
-	ReadFileResult
-} from '../types/types.d.js';
+import type {
+	SheetData
+} from '../types/SheetData.d.js'
 
-import {
+import type {
+	Sheet
+} from '../types/Sheet.d.js'
+
+import type {
+	Options
+} from '../types/Options.d.js'
+
+import type {
+	OptionsWithSchema
+} from '../types/OptionsWithSchema.d.js'
+
+import type {
 	ParseSheetDataOptions,
 	ParseSheetDataResult
-} from '../types/parseSheetData/parseSheetData.d.js';
+} from '../types/parseSheetData/parseSheetData.d.js'
 
-import {
+import type {
 	Schema
-} from '../types/parseSheetData/parseSheetDataSchema.d.js';
+} from '../types/parseSheetData/parseSheetDataSchema.d.js'
 
-import {
+import type {
 	ParseSheetDataError
-} from '../types/parseSheetData/parseSheetDataError.d.js';
+} from '../types/parseSheetData/parseSheetDataError.d.js'
 
-export {
+export type {
 	CellValue,
 	Row,
-	SheetData,
+	SheetData
+} from '../types/SheetData.d.js'
+
+export type {
 	Sheet
-} from '../types/types.d.js';
+} from '../types/Sheet.d.js'
 
-export {
+export type {
 	ParseSheetDataCustomType,
 	// Base `type`s when parsing data.
 	StringType as String,
@@ -40,45 +53,55 @@ export {
 	Integer,
 	Email,
 	URL
-} from '../types/parseSheetData/parseSheetDataValueType.d.js';
+} from '../types/parseSheetData/parseSheetDataValueType.d.js'
 
-export {
+export type {
 	ParseSheetDataCustomTypeErrorMessage,
 	ParseSheetDataCustomTypeErrorReason,
 	ParseSheetDataError,
 	ParseSheetDataValueRequiredError
-} from '../types/parseSheetData/parseSheetDataError.d.js';
+} from '../types/parseSheetData/parseSheetDataError.d.js'
 
-export {
+export type {
 	ParseSheetDataResult
-} from '../types/parseSheetData/parseSheetData.d.js';
+} from '../types/parseSheetData/parseSheetData.d.js'
 
-export {
+export type {
 	Schema
-} from '../types/parseSheetData/parseSheetDataSchema.d.js';
+} from '../types/parseSheetData/parseSheetDataSchema.d.js'
 
 export default function readXlsxFile<ParsedNumber = number>(
 	input: Input,
-	options?: ReadOptions<ParsedNumber>
-): Promise<ReadFileResult<ParsedNumber>>;
+	options?: Options<ParsedNumber>
+): Promise<Sheet<ParsedNumber>[]>;
 
 export function readSheet<ParsedNumber = number>(
 	input: Input,
 	sheet?: number | string,
-	options?: ReadOptions<ParsedNumber>
+	options?: Options<ParsedNumber>
 ): Promise<SheetData<ParsedNumber>>;
 
 export function readSheet<ParsedNumber = number>(
 	input: Input,
-	options?: ReadOptions<ParsedNumber>
+	options?: Options<ParsedNumber>
 ): Promise<SheetData<ParsedNumber>>;
 
+export function readSheet<
+	Object extends object,
+	ColumnTitle extends string = string,
+	Error extends ParseSheetDataError = ParseSheetDataError<ColumnTitle>,
+	ParsedNumber = number
+>(
+	input: Input,
+	options: OptionsWithSchema<Object, ColumnTitle, ParsedNumber>
+): Promise<ParseSheetDataResult<Object, ColumnTitle, Error>>;
+
 export function parseSheetData<
 	Object extends object,
-	ColumnTitle extends string,
-	Error extends ParseSheetDataError
+	ColumnTitle extends string = string,
+	Error extends ParseSheetDataError = ParseSheetDataError<ColumnTitle>
 >(
 	data: SheetData,
 	schema: Schema<Object, ColumnTitle>,
 	options?: ParseSheetDataOptions
-): ParseSheetDataResult<Object, Error>;
+): ParseSheetDataResult<Object, ColumnTitle, Error>;

package/node/input.d.ts

@@ -1,5 +1,5 @@
-import { Stream } from 'stream';
-import { Blob } from 'buffer';
+import type { Stream } from 'stream';
+import type { Blob } from 'buffer';
 
 // FYI: `Buffer` is also an `ArrayBuffer`.
 export type Input = string | Stream | Blob | Buffer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "read-excel-file",
-  "version": "9.0.6",
+  "version": "9.0.7",
   "description": "Read `.xlsx` files in a web browser or in Node.js",
   "type": "module",
   "exports": {

package/types/Options.d.ts

@@ -0,0 +1,5 @@
+export interface Options<ParsedNumber = number> {
+	trim?: boolean;
+	parseNumber?: (string: string) => ParsedNumber;
+	dateFormat?: string;
+}

package/types/OptionsWithSchema.d.ts

@@ -0,0 +1,10 @@
+import type { Options } from './Options.d.js'
+import type { Schema } from './parseSheetData/parseSheetDataSchema.d.js'
+
+export interface OptionsWithSchema<
+	Object extends object,
+	ColumnTitle extends string = string,
+	ParsedNumber = number
+> extends Options<ParsedNumber> {
+	schema: Schema<Object, ColumnTitle>;
+}

package/types/Sheet.d.ts

@@ -0,0 +1,6 @@
+import type { SheetData } from './SheetData.d.js'
+
+export type Sheet<ParsedNumber = number> = {
+	sheet: string;
+	data: SheetData<ParsedNumber>;
+}

package/types/SheetData.d.ts

@@ -0,0 +1,9 @@
+export type CellValue<ParsedNumber = number> =
+	| string
+	| ParsedNumber
+	| boolean
+	| typeof Date
+
+export type Row<ParsedNumber = number> = (CellValue<ParsedNumber> | null)[]
+
+export type SheetData<ParsedNumber = number> = Row<ParsedNumber>[]

package/types/parseSheetData/parseSheetData.d.ts

@@ -1,4 +1,4 @@
-import { ParseSheetDataError } from './parseSheetDataError.d.js'
+import type { ParseSheetDataError } from './parseSheetDataError.d.js'
 
 interface ParseSheetDataResultSuccess<Object> {
 	objects: Object[];
@@ -13,8 +13,9 @@ interface ParseSheetDataResultError<
 }
 
 export type ParseSheetDataResult<
-	Object,
-	Error extends ParseSheetDataError = ParseSheetDataError
+	Object extends object,
+	ColumnTitle extends string,
+	Error extends ParseSheetDataError = ParseSheetDataError<ColumnTitle>
 > =
 	| ParseSheetDataResultSuccess<Object>
 	| ParseSheetDataResultError<Error>

package/types/parseSheetData/parseSheetDataError.d.ts

@@ -1,6 +1,6 @@
-import { CellValue } from '../types.d.js'
+import type { CellValue } from '../SheetData.d.js'
 
-import {
+import type {
 	StringType,
 	DateType,
 	NumberType,

package/types/parseSheetData/parseSheetDataSchema.d.ts

@@ -1,11 +1,11 @@
-import { ParseSheetDataValueType, ParseSheetDataCustomType } from './parseSheetDataValueType.d.js'
+import type { ParseSheetDataValueType, ParseSheetDataCustomType } from './parseSheetDataValueType.d.js'
 
 type SchemaEntryRequiredOrNot<Object> = boolean | ((row: Object) => boolean);
 
 interface SchemaEntryForValue<
 	Key extends keyof Object,
-	Object,
-	TopLevelObject,
+	Object extends object,
+	TopLevelObject extends object,
 	ColumnTitle extends string
 > {
 	column: ColumnTitle;
@@ -19,28 +19,30 @@ interface SchemaEntryForValue<
 // https://dev.to/busypeoples/notes-on-typescript-recursive-types-and-immutability-5ck1
 interface SchemaEntryRecursive<
 	Key extends keyof Object,
-	Object,
-	TopLevelObject,
+	Object extends object,
+	TopLevelObject extends object,
 	ColumnTitle extends string
 > {
-	schema: Record<
-		keyof Object[Key],
-		SchemaEntry<keyof Object[Key], Object[Key], TopLevelObject, ColumnTitle>
-	>;
+	schema: Object[Key] extends object
+		? Record<
+			keyof Object[Key],
+			SchemaEntry<keyof Object[Key], Object[Key], TopLevelObject, ColumnTitle>
+		>
+		: never;
 	required?: SchemaEntryRequiredOrNot<TopLevelObject>;
 }
 
 type SchemaEntry<
 	Key extends keyof Object,
-	Object,
-	TopLevelObject,
+	Object extends object,
+	TopLevelObject extends object,
 	ColumnTitle extends string
 > =
 	| SchemaEntryForValue<Key, Object, TopLevelObject, ColumnTitle>
 	| SchemaEntryRecursive<Key, Object, TopLevelObject, ColumnTitle>;
 
 export type Schema<
-	Object = Record<string, any>,
+	Object extends object,
 	ColumnTitle extends string = string
 > = Record<
 	keyof Object,

package/types/parseSheetData/parseSheetDataValueType.d.ts

@@ -1,4 +1,4 @@
-import { CellValue } from '../types.d.js';
+import type { CellValue } from '../SheetData.d.js';
 
 // A way to define a `type = String` or `type = Number` variable in TypeScript
 // is by defining it as `type: StringConstructor` or `type: NumberConstructor`.

package/universal/index.d.ts

@@ -1,35 +1,48 @@
 // The contents of this file is identical between the different exports:
 // `/node`, `/browser`, etc.
 
-import { Input } from './input.d.js'
+import type { Input } from './input.d.js'
 
-import {
-	SheetData,
-	ReadOptions,
-	ReadFileResult
-} from '../types/types.d.js';
+import type {
+	SheetData
+} from '../types/SheetData.d.js'
 
-import {
+import type {
+	Sheet
+} from '../types/Sheet.d.js'
+
+import type {
+	Options
+} from '../types/Options.d.js'
+
+import type {
+	OptionsWithSchema
+} from '../types/OptionsWithSchema.d.js'
+
+import type {
 	ParseSheetDataOptions,
 	ParseSheetDataResult
-} from '../types/parseSheetData/parseSheetData.d.js';
+} from '../types/parseSheetData/parseSheetData.d.js'
 
-import {
+import type {
 	Schema
-} from '../types/parseSheetData/parseSheetDataSchema.d.js';
+} from '../types/parseSheetData/parseSheetDataSchema.d.js'
 
-import {
+import type {
 	ParseSheetDataError
-} from '../types/parseSheetData/parseSheetDataError.d.js';
+} from '../types/parseSheetData/parseSheetDataError.d.js'
 
-export {
+export type {
 	CellValue,
 	Row,
-	SheetData,
+	SheetData
+} from '../types/SheetData.d.js'
+
+export type {
 	Sheet
-} from '../types/types.d.js';
+} from '../types/Sheet.d.js'
 
-export {
+export type {
 	ParseSheetDataCustomType,
 	// Base `type`s when parsing data.
 	StringType as String,
@@ -40,45 +53,55 @@ export {
 	Integer,
 	Email,
 	URL
-} from '../types/parseSheetData/parseSheetDataValueType.d.js';
+} from '../types/parseSheetData/parseSheetDataValueType.d.js'
 
-export {
+export type {
 	ParseSheetDataCustomTypeErrorMessage,
 	ParseSheetDataCustomTypeErrorReason,
 	ParseSheetDataError,
 	ParseSheetDataValueRequiredError
-} from '../types/parseSheetData/parseSheetDataError.d.js';
+} from '../types/parseSheetData/parseSheetDataError.d.js'
 
-export {
+export type {
 	ParseSheetDataResult
-} from '../types/parseSheetData/parseSheetData.d.js';
+} from '../types/parseSheetData/parseSheetData.d.js'
 
-export {
+export type {
 	Schema
-} from '../types/parseSheetData/parseSheetDataSchema.d.js';
+} from '../types/parseSheetData/parseSheetDataSchema.d.js'
 
 export default function readXlsxFile<ParsedNumber = number>(
 	input: Input,
-	options?: ReadOptions<ParsedNumber>
-): Promise<ReadFileResult<ParsedNumber>>;
+	options?: Options<ParsedNumber>
+): Promise<Sheet<ParsedNumber>[]>;
 
 export function readSheet<ParsedNumber = number>(
 	input: Input,
 	sheet?: number | string,
-	options?: ReadOptions<ParsedNumber>
+	options?: Options<ParsedNumber>
 ): Promise<SheetData<ParsedNumber>>;
 
 export function readSheet<ParsedNumber = number>(
 	input: Input,
-	options?: ReadOptions<ParsedNumber>
+	options?: Options<ParsedNumber>
 ): Promise<SheetData<ParsedNumber>>;
 
+export function readSheet<
+	Object extends object,
+	ColumnTitle extends string = string,
+	Error extends ParseSheetDataError = ParseSheetDataError<ColumnTitle>,
+	ParsedNumber = number
+>(
+	input: Input,
+	options: OptionsWithSchema<Object, ColumnTitle, ParsedNumber>
+): Promise<ParseSheetDataResult<Object, ColumnTitle, Error>>;
+
 export function parseSheetData<
 	Object extends object,
-	ColumnTitle extends string,
-	Error extends ParseSheetDataError
+	ColumnTitle extends string = string,
+	Error extends ParseSheetDataError = ParseSheetDataError<ColumnTitle>
 >(
 	data: SheetData,
 	schema: Schema<Object, ColumnTitle>,
 	options?: ParseSheetDataOptions
-): ParseSheetDataResult<Object, Error>;
+): ParseSheetDataResult<Object, ColumnTitle, Error>;

package/web-worker/index.d.ts

@@ -1,35 +1,48 @@
 // The contents of this file is identical between the different exports:
 // `/node`, `/browser`, etc.
 
-import { Input } from './input.d.js'
+import type { Input } from './input.d.js'
 
-import {
-	SheetData,
-	ReadOptions,
-	ReadFileResult
-} from '../types/types.d.js';
+import type {
+	SheetData
+} from '../types/SheetData.d.js'
 
-import {
+import type {
+	Sheet
+} from '../types/Sheet.d.js'
+
+import type {
+	Options
+} from '../types/Options.d.js'
+
+import type {
+	OptionsWithSchema
+} from '../types/OptionsWithSchema.d.js'
+
+import type {
 	ParseSheetDataOptions,
 	ParseSheetDataResult
-} from '../types/parseSheetData/parseSheetData.d.js';
+} from '../types/parseSheetData/parseSheetData.d.js'
 
-import {
+import type {
 	Schema
-} from '../types/parseSheetData/parseSheetDataSchema.d.js';
+} from '../types/parseSheetData/parseSheetDataSchema.d.js'
 
-import {
+import type {
 	ParseSheetDataError
-} from '../types/parseSheetData/parseSheetDataError.d.js';
+} from '../types/parseSheetData/parseSheetDataError.d.js'
 
-export {
+export type {
 	CellValue,
 	Row,
-	SheetData,
+	SheetData
+} from '../types/SheetData.d.js'
+
+export type {
 	Sheet
-} from '../types/types.d.js';
+} from '../types/Sheet.d.js'
 
-export {
+export type {
 	ParseSheetDataCustomType,
 	// Base `type`s when parsing data.
 	StringType as String,
@@ -40,45 +53,55 @@ export {
 	Integer,
 	Email,
 	URL
-} from '../types/parseSheetData/parseSheetDataValueType.d.js';
+} from '../types/parseSheetData/parseSheetDataValueType.d.js'
 
-export {
+export type {
 	ParseSheetDataCustomTypeErrorMessage,
 	ParseSheetDataCustomTypeErrorReason,
 	ParseSheetDataError,
 	ParseSheetDataValueRequiredError
-} from '../types/parseSheetData/parseSheetDataError.d.js';
+} from '../types/parseSheetData/parseSheetDataError.d.js'
 
-export {
+export type {
 	ParseSheetDataResult
-} from '../types/parseSheetData/parseSheetData.d.js';
+} from '../types/parseSheetData/parseSheetData.d.js'
 
-export {
+export type {
 	Schema
-} from '../types/parseSheetData/parseSheetDataSchema.d.js';
+} from '../types/parseSheetData/parseSheetDataSchema.d.js'
 
 export default function readXlsxFile<ParsedNumber = number>(
 	input: Input,
-	options?: ReadOptions<ParsedNumber>
-): Promise<ReadFileResult<ParsedNumber>>;
+	options?: Options<ParsedNumber>
+): Promise<Sheet<ParsedNumber>[]>;
 
 export function readSheet<ParsedNumber = number>(
 	input: Input,
 	sheet?: number | string,
-	options?: ReadOptions<ParsedNumber>
+	options?: Options<ParsedNumber>
 ): Promise<SheetData<ParsedNumber>>;
 
 export function readSheet<ParsedNumber = number>(
 	input: Input,
-	options?: ReadOptions<ParsedNumber>
+	options?: Options<ParsedNumber>
 ): Promise<SheetData<ParsedNumber>>;
 
+export function readSheet<
+	Object extends object,
+	ColumnTitle extends string = string,
+	Error extends ParseSheetDataError = ParseSheetDataError<ColumnTitle>,
+	ParsedNumber = number
+>(
+	input: Input,
+	options: OptionsWithSchema<Object, ColumnTitle, ParsedNumber>
+): Promise<ParseSheetDataResult<Object, ColumnTitle, Error>>;
+
 export function parseSheetData<
 	Object extends object,
-	ColumnTitle extends string,
-	Error extends ParseSheetDataError
+	ColumnTitle extends string = string,
+	Error extends ParseSheetDataError = ParseSheetDataError<ColumnTitle>
 >(
 	data: SheetData,
 	schema: Schema<Object, ColumnTitle>,
 	options?: ParseSheetDataOptions
-): ParseSheetDataResult<Object, Error>;
+): ParseSheetDataResult<Object, ColumnTitle, Error>;

package/types/types.d.ts

@@ -1,22 +0,0 @@
-export type CellValue<ParsedNumber = number> =
-	| string
-	| ParsedNumber
-	| boolean
-	| typeof Date
-
-export type Row<ParsedNumber = number> = (CellValue<ParsedNumber> | null)[]
-
-export type SheetData<ParsedNumber = number> = Row<ParsedNumber>[]
-
-export type Sheet<ParsedNumber = number> = {
-	sheet: string;
-	data: SheetData<ParsedNumber>;
-}
-
-export type ReadFileResult<ParsedNumber = number> = Sheet<ParsedNumber>[]
-
-export interface ReadOptions<ParsedNumber = number> {
-	trim?: boolean;
-	parseNumber?: (string: string) => ParsedNumber;
-	dateFormat?: string;
-}