chore: fmt

I gave oxfmt a shot, and I wasn't happy with the results at all.

Especially in places with dense and complex code, applying opinionated
format is stupid and just doesn't work. It made the `parseString`
function really hard to read because it squished everything together.

I still kept the stuff it did right :)

Author: cyyynthia

bench/parse.bench.ts

@@ -88,7 +88,7 @@ summary(() => {
 				}
 			})
 
-			bench('deno\'s @std/toml', function* () {
+			bench("deno's @std/toml", function* () {
 				yield {
 					[0]() {
 						return toml

bench/stringify.bench.ts

@@ -75,7 +75,7 @@ summary(() => {
 				}
 			})
 
-			bench('deno\'s @std/toml', function* () {
+			bench("deno's @std/toml", function* () {
 				yield {
 					[0]() {
 						return toml

src/date.ts

@@ -38,7 +38,7 @@ export class TomlDate extends Date {
 	#hasTime = false
 	#offset: Offset = null
 
-	constructor (date: string | Date) {
+	constructor(date: string | Date) {
 		let hasDate = true
 		let hasTime = true
 		let offset: Offset = 'Z'
@@ -75,23 +75,23 @@ export class TomlDate extends Date {
 		}
 	}
 
-	isDateTime () {
+	isDateTime() {
 		return this.#hasDate && this.#hasTime
 	}
 
-	isLocal () {
+	isLocal() {
 		return !this.#hasDate || !this.#hasTime || !this.#offset
 	}
 
-	isDate () {
+	isDate() {
 		return this.#hasDate && !this.#hasTime
 	}
 
-	isTime () {
+	isTime() {
 		return this.#hasTime && !this.#hasDate
 	}
 
-	isValid () {
+	isValid() {
 		return this.#hasDate || this.#hasTime
 	}
 
@@ -124,26 +124,26 @@ export class TomlDate extends Date {
 		return offsetDate.toISOString().slice(0, -1) + this.#offset
 	}
 
-	static wrapAsOffsetDateTime (jsDate: Date, offset = 'Z') {
+	static wrapAsOffsetDateTime(jsDate: Date, offset = 'Z') {
 		let date = new TomlDate(jsDate)
 		date.#offset = offset
 		return date
 	}
 
-	static wrapAsLocalDateTime (jsDate: Date) {
+	static wrapAsLocalDateTime(jsDate: Date) {
 		let date = new TomlDate(jsDate)
 		date.#offset = null
 		return date
 	}
 
-	static wrapAsLocalDate (jsDate: Date) {
+	static wrapAsLocalDate(jsDate: Date) {
 		let date = new TomlDate(jsDate)
 		date.#hasTime = false
 		date.#offset = null
 		return date
 	}
 
-	static wrapAsLocalTime (jsDate: Date) {
+	static wrapAsLocalTime(jsDate: Date) {
 		let date = new TomlDate(jsDate)
 		date.#hasDate = false
 		date.#offset = null

src/error.ts

@@ -31,12 +31,12 @@ type TomlErrorOptions = ErrorOptions & {
 	ptr: number
 }
 
-function getLineColFromPtr (string: string, ptr: number): [ number, number ] {
+function getLineColFromPtr(string: string, ptr: number): [number, number] {
 	let lines = string.slice(0, ptr).split(/\r\n|\n|\r/g)
-	return [ lines.length, lines.pop()!.length + 1 ]
+	return [lines.length, lines.pop()!.length + 1]
 }
 
-function makeCodeBlock (string: string, line: number, column: number) {
+function makeCodeBlock(string: string, line: number, column: number) {
 	let lines = string.split(/\r\n|\n|\r/g)
 	let codeblock = ''
 
@@ -65,8 +65,8 @@ export class TomlError extends Error {
 	column: number
 	codeblock: string
 
-	constructor (message: string, options: TomlErrorOptions) {
-		const [ line, column ] = getLineColFromPtr(options.toml, options.ptr)
+	constructor(message: string, options: TomlErrorOptions) {
+		const [line, column] = getLineColFromPtr(options.toml, options.ptr)
 		const codeblock = makeCodeBlock(options.toml, line, column)
 
 		super(`Invalid TOML document: ${message}\n\n${codeblock}`, options)

src/extract.ts

@@ -31,7 +31,7 @@ import { parseArray, parseInlineTable } from './struct.js'
 import { skipVoid, skipUntil, skipComment, type TomlValue } from './util.js'
 import { TomlError } from './error.js'
 
-function sliceAndTrimEndOf (str: string, startPtr: number, endPtr: number): [ string, number ] {
+function sliceAndTrimEndOf(str: string, startPtr: number, endPtr: number): [string, number] {
 	let value = str.slice(startPtr, endPtr)
 
 	let commentIdx = value.indexOf('#')
@@ -42,25 +42,20 @@ function sliceAndTrimEndOf (str: string, startPtr: number, endPtr: number): [ st
 		value = value.slice(0, commentIdx)
 	}
 
-	return [ value.trimEnd(), commentIdx ]
+	return [value.trimEnd(), commentIdx]
 }
 
-export function extractValue (
-	str: string, ptr: number,
-	end: string | undefined,
-	depth: number,
-	integersAsBigInt: IntegersAsBigInt,
-): [ TomlValue, number ] {
+export function extractValue(str: string, ptr: number, end: string | undefined, depth: number, integersAsBigInt: IntegersAsBigInt): [TomlValue, number] {
 	if (depth === 0) {
 		throw new TomlError('document contains excessively nested structures. aborting.', {
 			toml: str,
-			ptr: ptr
+			ptr: ptr,
 		})
 	}
 
 	let c = str[ptr]
 	if (c === '[' || c === '{') {
-		let [ value, endPtr ] = c === '['
+		let [value, endPtr] = c === '['
 			? parseArray(str, ptr, depth, integersAsBigInt)
 			: parseInlineTable(str, ptr, depth, integersAsBigInt)
 
@@ -75,7 +70,7 @@ export function extractValue (
 			}
 		}
 
-		return [ value, endPtr ]
+		return [value, endPtr]
 	}
 
 	if (c === '"' || c === "'") {
@@ -93,15 +88,15 @@ export function extractValue (
 			if (str[endPtr] === ',') endPtr++
 		}
 
-		return [ parsed, endPtr ]
+		return [parsed, endPtr]
 	}
 
 	let endPtr = skipUntil(str, ptr, ',', end)
 	let slice = sliceAndTrimEndOf(str, ptr, endPtr - (str[endPtr - 1] === ',' ? 1 : 0))
 	if (!slice[0]) {
 		throw new TomlError('incomplete key-value declaration: no value specified', {
 			toml: str,
-			ptr: ptr
+			ptr: ptr,
 		})
 	}
 

src/index.ts

@@ -38,5 +38,5 @@ export { parse, stringify, TomlDate, TomlError }
 
 export type {
 	/** @deprecated use TomlValue instead */
-	TomlValue as TomlPrimitive
+	TomlValue as TomlPrimitive,
 } from './util.js'

src/parse.ts

@@ -34,11 +34,11 @@ import { TomlError } from './error.js'
 
 const enum Type { DOTTED, EXPLICIT, ARRAY, ARRAY_DOTTED }
 
-type MetaState = { t: Type, d: boolean, i: number, c: MetaRecord }
+type MetaState = { t: Type; d: boolean; i: number; c: MetaRecord }
 type MetaRecord = { [k: string]: MetaState }
-type PeekResult = [ string, TomlTable, MetaRecord ] | null
+type PeekResult = [string, TomlTable, MetaRecord] | null
 
-function peekTable (key: string[], table: TomlTable, meta: MetaRecord, type: Type): PeekResult {
+function peekTable(key: string[], table: TomlTable, meta: MetaRecord, type: Type): PeekResult {
 	let t: any = table
 	let m = meta
 	let k: string
@@ -111,17 +111,17 @@ function peekTable (key: string[], table: TomlTable, meta: MetaRecord, type: Typ
 		return null
 	}
 
-	return [ k!, t, state.c ]
+	return [k!, t, state.c]
 }
 
 export interface ParseOptions {
 	maxDepth?: number
 	integersAsBigInt?: IntegersAsBigInt
 }
 
-export function parse(toml: string, options?: ParseOptions & { integersAsBigInt: Exclude<IntegersAsBigInt, undefined | false> }): TomlTable;
-export function parse(toml: string, options?: ParseOptions): TomlTableWithoutBigInt;
-export function parse(toml: string,	{ maxDepth = 1000, integersAsBigInt }: ParseOptions = {}): TomlTable {
+export function parse(toml: string, options?: ParseOptions & { integersAsBigInt: Exclude<IntegersAsBigInt, undefined | false> }): TomlTable
+export function parse(toml: string, options?: ParseOptions): TomlTableWithoutBigInt
+export function parse(toml: string, { maxDepth = 1000, integersAsBigInt }: ParseOptions = {}): TomlTable {
 	let res = {}
 	let meta = {}
 
@@ -131,7 +131,7 @@ export function parse(toml: string,	{ maxDepth = 1000, integersAsBigInt }: Parse
 	for (let ptr = skipVoid(toml, 0); ptr < toml.length;) {
 		if (toml[ptr] === '[') {
 			let isTableArray = toml[++ptr] === '['
-			let k = parseKey(toml, ptr += +isTableArray, ']')
+			let k = parseKey(toml, (ptr += +isTableArray), ']')
 
 			if (isTableArray) {
 				if (toml[k[1] - 1] !== ']') {
@@ -165,16 +165,16 @@ export function parse(toml: string,	{ maxDepth = 1000, integersAsBigInt }: Parse
 				})
 			}
 
-			let v = extractValue(toml, k[1], void 0, maxDepth, integersAsBigInt);
-			p[1][p[0]] = v[0];
-			ptr = v[1];
+			let v = extractValue(toml, k[1], void 0, maxDepth, integersAsBigInt)
+			p[1][p[0]] = v[0]
+			ptr = v[1]
 		}
 
 		ptr = skipVoid(toml, ptr, true)
 		if (toml[ptr] && toml[ptr] !== '\n' && toml[ptr] !== '\r') {
 			throw new TomlError('each key-value declaration must be followed by an end-of-line', {
 				toml: toml,
-				ptr: ptr
+				ptr: ptr,
 			})
 		}
 		ptr = skipVoid(toml, ptr)

src/primitive.ts

@@ -34,7 +34,7 @@ let INT_REGEX = /^((0x[0-9a-fA-F](_?[0-9a-fA-F])*)|(([+-]|0[ob])?\d(_?\d)*))$/
 let FLOAT_REGEX = /^[+-]?\d(_?\d)*(\.\d(_?\d)*)?([eE][+-]?\d(_?\d)*)?$/
 let LEADING_ZERO = /^[+-]?0[0-9_]/
 
-export function parseString (str: string, ptr: number): [string, number] {
+export function parseString(str: string, ptr: number): [string, number] {
 	let c = str[ptr++]!
 	let first = c
 	let isLiteral = c === "'"
@@ -115,13 +115,13 @@ export function parseString (str: string, ptr: number): [string, number] {
 				// If we're in a newline escape still, then there's nothing to add.
 				// Also try to avoid concat if there's nothing to add to parsed, or nothing has been added to parsed.
 				state ? parsed : parsed + str.slice(sliceStart, i),
-				i + (isMultiline ? 3 : 1)
+				i + (isMultiline ? 3 : 1),
 			]
 		}
 
 		else if (!state) {
 			if (!isLiteral && c === '\\') {
-				parsed += str.slice(sliceStart, sliceStart = i)
+				parsed += str.slice(sliceStart, (sliceStart = i))
 				state = 1
 			}
 		}
@@ -190,7 +190,7 @@ export function parseString (str: string, ptr: number): [string, number] {
 
 export type IntegersAsBigInt = undefined | boolean | 'asNeeded'
 
-export function parseValue (value: string, toml: string, ptr: number, integersAsBigInt: IntegersAsBigInt): boolean | number | bigint | TomlDate {
+export function parseValue(value: string, toml: string, ptr: number, integersAsBigInt: IntegersAsBigInt): boolean | number | bigint | TomlDate {
 	// Constant values
 	if (value === 'true') return true
 	if (value === 'false') return false

src/stringify.ts

@@ -29,7 +29,7 @@
 let BARE_KEY = /^[a-z0-9-_]+$/i
 
 type ExtendedType = ReturnType<typeof extendedTypeOf>
-function extendedTypeOf (obj: any) {
+function extendedTypeOf(obj: any) {
 	let type = typeof obj
 	if (type === 'object') {
 		if (Array.isArray(obj)) return 'array'
@@ -39,19 +39,19 @@ function extendedTypeOf (obj: any) {
 	return type
 }
 
-function isArrayOfTables (obj: any[]) {
+function isArrayOfTables(obj: any[]) {
 	for (let i = 0; i < obj.length; i++) {
 		if (extendedTypeOf(obj[i]) !== 'object') return false
 	}
 
 	return obj.length != 0
 }
 
-function formatString (s: string) {
+function formatString(s: string) {
 	return JSON.stringify(s).replace(/\x7f/g, '\\u007f')
 }
 
-function stringifyValue (val: any, type: ExtendedType, depth: number, numberAsFloat: boolean) {
+function stringifyValue(val: any, type: ExtendedType, depth: number, numberAsFloat: boolean) {
 	if (depth === 0) {
 		throw new Error('Could not stringify the object: maximum object depth exceeded')
 	}
@@ -89,7 +89,7 @@ function stringifyValue (val: any, type: ExtendedType, depth: number, numberAsFl
 	}
 }
 
-function stringifyInlineTable (obj: any, depth: number, numberAsFloat: boolean) {
+function stringifyInlineTable(obj: any, depth: number, numberAsFloat: boolean) {
 	let keys = Object.keys(obj)
 	if (keys.length === 0) return '{}'
 
@@ -106,7 +106,7 @@ function stringifyInlineTable (obj: any, depth: number, numberAsFloat: boolean)
 	return res + ' }'
 }
 
-function stringifyArray (array: any[], depth: number, numberAsFloat: boolean) {
+function stringifyArray(array: any[], depth: number, numberAsFloat: boolean) {
 	if (array.length === 0) return '[]'
 
 	let res = '[ '
@@ -122,7 +122,7 @@ function stringifyArray (array: any[], depth: number, numberAsFloat: boolean) {
 	return res + ' ]'
 }
 
-function stringifyArrayTable (array: any[], key: string, depth: number, numberAsFloat: boolean) {
+function stringifyArrayTable(array: any[], key: string, depth: number, numberAsFloat: boolean) {
 	if (depth === 0) {
 		throw new Error('Could not stringify the object: maximum object depth exceeded')
 	}
@@ -136,7 +136,7 @@ function stringifyArrayTable (array: any[], key: string, depth: number, numberAs
 	return res
 }
 
-function stringifyTable (tableKey: string | 0, obj: any, prefix: string, depth: number, numberAsFloat: boolean) {
+function stringifyTable(tableKey: string | 0, obj: any, prefix: string, depth: number, numberAsFloat: boolean) {
 	if (depth === 0) {
 		throw new Error('Could not stringify the object: maximum object depth exceeded')
 	}