fix: preserve type-level syntax that was being dropped when printing

.changeset/wild-jokes-listen.md

@@ -0,0 +1,5 @@
+---
+'esrap': patch
+---
+
+fix: preserve type-level syntax that was being dropped when printing

.prettierignore

@@ -6,3 +6,4 @@ test/sandbox/_output.js
 
 expected.ts
 expected.jsx
+expected.tsx

src/languages/ts/index.js

@@ -2086,6 +2086,11 @@ export default (options = {}) => {
 		TSTypeQuery(node, context) {
 			context.write('typeof ');
 			context.visit(node.exprName);
+
+			// instantiation expression (`typeof foo<string>`)
+			if (node.typeArguments) {
+				context.visit(node.typeArguments);
+			}
 		},
 
 		TSClassImplements(node, context) {
@@ -2169,6 +2174,11 @@ export default (options = {}) => {
 		},
 
 		TSMethodSignature(node, context) {
+			// accessor signatures (`get x(): string`, `set x(value: string)`)
+			if (node.kind === 'get' || node.kind === 'set') {
+				write_keyword(context, node, node.kind, ' ');
+			}
+
 			if (node.computed) context.write('[', token_before(node.key.loc?.start));
 			context.visit(node.key);
 			if (node.computed) context.write(']', token_at(node.key.loc?.end));
@@ -2204,6 +2214,8 @@ export default (options = {}) => {
 
 		TSNamedTupleMember(node, context) {
 			context.visit(node.label);
+			// optional element (`[a?: string]`)
+			if (node.optional) context.write('?');
 			context.write(': ');
 			context.visit(node.elementType);
 		},

src/languages/tsx/index.js

@@ -35,6 +35,11 @@ export default (options) => ({
 
 		context.visit(node.name);
 
+		// explicit type arguments (`<Comp<string> ... />`)
+		if (node.typeArguments) {
+			context.visit(node.typeArguments);
+		}
+
 		for (const attribute of node.attributes) {
 			context.write(' ');
 			context.visit(attribute);

test/samples/ts-type-level-syntax/expected.ts

@@ -0,0 +1,5 @@
+type Tuple = [required: string, optional?: number, ...rest: boolean[]];
+
+interface Accessors { get value(): string; set value(next: string); method(): void }
+
+type Instantiated = typeof identity<string>;

test/samples/ts-type-level-syntax/expected.ts.map

@@ -0,0 +1,11 @@
+{
+  "version": 3,
+  "names": [],
+  "sources": [
+    "input.js"
+  ],
+  "sourcesContent": [
+    "type Tuple = [required: string, optional?: number, ...rest: boolean[]];\n\ninterface Accessors {\n\tget value(): string;\n\tset value(next: string);\n\tmethod(): void;\n}\n\ntype Instantiated = typeof identity<string>;\n"
+  ],
+  "mappings": "KAAK,KAAK,IAAI,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAG,MAAM,KAAK,IAAI,EAAE,OAAO;;UAEzD,SAAS,GAClB,GAAG,CAAC,KAAK,IAAI,MAAM,EACnB,GAAG,CAAC,KAAK,CAAC,IAAY,EAAN,MAAM,GACtB,MAAM,IAAI,IAAI;;KAGV,YAAY,UAAU,QAAQ,CAAC,MAAM"
+}

test/samples/ts-type-level-syntax/input.ts

@@ -0,0 +1,9 @@
+type Tuple = [required: string, optional?: number, ...rest: boolean[]];
+
+interface Accessors {
+	get value(): string;
+	set value(next: string);
+	method(): void;
+}
+
+type Instantiated = typeof identity<string>;

test/samples/tsx-element-type-arguments/expected.tsx

@@ -0,0 +1,3 @@
+const list = <List<string> items={items} />;
+const nested = <Table<Row, Column>>{children}</Table>;
+const plain = <div className="x" />;

test/samples/tsx-element-type-arguments/expected.tsx.map

@@ -0,0 +1,11 @@
+{
+  "version": 3,
+  "names": [],
+  "sources": [
+    "input.js"
+  ],
+  "sourcesContent": [
+    "const list = <List<string> items={items} />;\nconst nested = <Table<Row, Column>>{children}</Table>;\nconst plain = <div className=\"x\" />;\n"
+  ],
+  "mappings": "AAAA,MAAM,AAAA,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK;AACvC,MAAM,AAAA,MAAM,IAAI,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,KAAK;AACpD,MAAM,AAAA,KAAK,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG"
+}

test/samples/tsx-element-type-arguments/input.tsx

@@ -0,0 +1,3 @@
+const list = <List<string> items={items} />;
+const nested = <Table<Row, Column>>{children}</Table>;
+const plain = <div className="x" />;