Improve OXC Support

.changeset/fifty-dolls-divide.md

@@ -0,0 +1,5 @@
+---
+'esrap': patch
+---
+
+Properly print `ParenthesizedExpression`s

.changeset/twelve-parents-battle.md

@@ -0,0 +1,5 @@
+---
+'esrap': minor
+---
+
+Add automatic handling of indexed locations.

src/context.js

@@ -7,10 +7,27 @@ export const indent = 2;
 export const dedent = 3;
 export const space = 4;
 
+/**
+ * Get the line and column number from a character index in the source text.
+ *
+ * @param {number} charIndex
+ * @param {string} sourceText
+ * @returns {{ line: number, column: number }}
+ */
+function getLineAndColumn(charIndex, sourceText) {
+	const lineZeroBased = sourceText.slice(0, charIndex).split('\n');
+	const columnZeroBased = lineZeroBased[lineZeroBased.length - 1].length;
+	return {
+		line: lineZeroBased.length + 1,
+		column: columnZeroBased
+	};
+}
+
 export class Context {
 	#visitors;
 	#commands;
 	#has_newline = false;
+	#sourceText = undefined;
 
 	multiline = false;
 
@@ -19,9 +36,10 @@ export class Context {
 	 * @param {Visitors} visitors
 	 * @param {Command[]} commands
 	 */
-	constructor(visitors, commands = []) {
+	constructor(visitors, commands = [], sourceText = undefined) {
 		this.#visitors = visitors;
 		this.#commands = commands;
+		this.#sourceText = sourceText;
 	}
 
 	indent() {
@@ -85,7 +103,7 @@ export class Context {
 	}
 
 	/**
-	 * @param {{ type: string }} node
+	 * @param {{ type: string, start?: number, end?: number }} node
 	 */
 	visit(node) {
 		const visitor = this.#visitors[node.type];
@@ -104,13 +122,22 @@ export class Context {
 			throw new Error(message);
 		}
 
+		if (node.start != null && this.#sourceText) {
+			const { line, column } = getLineAndColumn(node.start, this.#sourceText);
+			this.location(line, column);
+		}
+
 		if (this.#visitors._) {
 			// @ts-ignore
 			this.#visitors._(node, this, (node) => visitor(node, this));
 		} else {
 			// @ts-ignore
 			visitor(node, this);
 		}
+		if (node.end != null && this.#sourceText) {
+			const { line, column } = getLineAndColumn(node.end, this.#sourceText);
+			this.location(line, column);
+		}
 	}
 
 	empty() {

src/index.js

@@ -1,4 +1,5 @@
 /** @import { BaseNode, Command, Visitors, PrintOptions } from './types' */
+/** @import { TSESTree } from '@typescript-eslint/types' */
 import { encode } from '@jridgewell/sourcemap-codec';
 import { Context, dedent, indent, margin, newline, space } from './context.js';
 
@@ -56,7 +57,7 @@ export function print(node, visitors, opts = {}) {
 	const commands = [];
 
 	// @ts-expect-error some nonsense I don't understand
-	const context = new Context(visitors, commands);
+	const context = new Context(visitors, commands, opts.sourceMapContent);
 
 	context.visit(node);
 

src/languages/ts/index.js

@@ -1067,7 +1067,9 @@ export default (options = {}) => {
 
 		// @ts-expect-error this isn't a real node type, but Acorn produces it
 		ParenthesizedExpression(node, context) {
-			return context.visit(node.expression);
+			context.write('(');
+			context.visit(node.expression);
+			context.write(')');
 		},
 
 		PrivateIdentifier(node, context) {

test/esrap.test.js

@@ -7,6 +7,7 @@ import { walk } from 'zimmerframe';
 import { print } from '../src/index.js';
 import { acornTs, acornTsx, load } from './common.js';
 import tsx from '../src/languages/tsx/index.js';
+import { rm } from 'node:fs/promises';
 
 /** @param {TSESTree.Node} ast */
 function clean(ast) {

test/samples/arrow-function-needs-braces/expected.js

@@ -1,3 +1,3 @@
 let a = () => ({ x } = { x: 42 });
 let b = () => ({} || bar);
-let c = () => ({} ? foo : bar);
+let c = () => ({} ? foo : bar);

test/samples/await-precedence/expected.js

@@ -1,2 +1,2 @@
 await (a || b);
-await c;
+await c;

test/samples/break-continue/expected.js

@@ -14,4 +14,4 @@ x: for (let i = 0; i < 10; i += 1) {
 	if (should_continue_with_label) {
 		continue x;
 	}
-}
+}

test/samples/call-expressions/expected.js

@@ -12,4 +12,4 @@ x(
 	() => {
 		console.log('c');
 	}
-);
+);

test/samples/chain-expressions/expected.js

@@ -1,3 +1,3 @@
 foo?.bar.baz;
 x?.(a, b, c);
-x()?.();
+x()?.();

test/samples/class-static-block/expected.js

@@ -2,4 +2,4 @@ class Foo {
 	static {
 		this.abc = 1;
 	}
-}
+}

test/samples/comment-after-function-argument/expected.js

@@ -3,4 +3,4 @@ foo(
 		// logic goes here
 	},
 	true
-); // trailing comment
+); // trailing comment

test/samples/comment-between-blocks/expected.js

@@ -4,4 +4,4 @@ if (condition) {
 } else // otherwise nope
 {
 	console.log('nope');
-}
+}

test/samples/comment-block/expected.js

@@ -4,4 +4,4 @@ console.log(1);
 
 console.log(2); /* comment on same line as node */
 
-const obj = { foo: 1, /* comment in middle of object */ bar: 2 };
+const obj = { foo: 1, /* comment in middle of object */ bar: 2 };

test/samples/comment-inline-inserted/expected.js

@@ -2,4 +2,4 @@
 "use strict";
 
 // comment before an inserted node
-import { foo } from "wherever";
+import { foo } from "wherever";

test/samples/comment-inline/expected.js

@@ -11,4 +11,4 @@ const obj = {
 
 function bar() {
 	return (/*result*/ foo);
-}
+}

test/samples/comment-mixed-trailing/expected.js

@@ -3,4 +3,4 @@ function foo() {
 	/*
 	hey2
 	*/
-}
+}

test/samples/comment-within-parentheses/expected.js

@@ -6,4 +6,4 @@ function foo() {
 function bar() {
 	return (/* hey */
 	abc);
-}
+}

test/samples/computed-getter/expected.js

@@ -2,4 +2,4 @@ obj = {
 	get [foo]() {
 		return bar;
 	}
-};
+};