Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions crates/oxc_ast/src/ast/ts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,7 @@ pub struct TSIntersectionType<'a> {
#[ast(visit)]
#[derive(Debug)]
#[generate_derive(CloneIn, Dummy, TakeIn, GetSpan, GetSpanMut, ContentEq, ESTree)]
#[estree(via = TSParenthesizedTypeConverter)]
pub struct TSParenthesizedType<'a> {
pub span: Span,
pub type_annotation: TSType<'a>,
Expand Down
6 changes: 1 addition & 5 deletions crates/oxc_ast/src/generated/derive_estree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2346,11 +2346,7 @@ impl ESTree for TSIntersectionType<'_> {

impl ESTree for TSParenthesizedType<'_> {
fn serialize<S: Serializer>(&self, serializer: S) {
let mut state = serializer.serialize_struct();
state.serialize_field("type", &JsonSafeString("TSParenthesizedType"));
state.serialize_field("typeAnnotation", &self.type_annotation);
state.serialize_span(self.span);
state.end();
crate::serialize::ts::TSParenthesizedTypeConverter(self).serialize(serializer)
}
}

Expand Down
35 changes: 35 additions & 0 deletions crates/oxc_ast/src/serialize/ts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -401,3 +401,38 @@ impl ESTree for TSFunctionTypeParams<'_, '_> {
Concat2(&fn_type.this_param, fn_type.params.as_ref()).serialize(serializer);
}
}

/// Converter for [`TSParenthesizedType`].
///
/// In raw transfer, do not produce a `TSParenthesizedType` node in AST if `preserveParens` is false.
///
/// Not useful in `oxc-parser`, as can use parser option `preserve_parens`.
/// Required for `oxlint` plugins where we run parser with `preserve_parens` set to `true`,
/// to preserve them on Rust side, but need to remove them on JS side.
///
/// ESTree implementation is unchanged from the auto-generated version.
#[ast_meta]
#[estree(raw_deser = "
let node = DESER[TSType](POS_OFFSET.type_annotation);
if (preserveParens) {
node = {
type: 'TSParenthesizedType',
typeAnnotation: node,
start: DESER[u32]( POS_OFFSET.span.start ),
end: DESER[u32]( POS_OFFSET.span.end ),
};
}
node
")]
pub struct TSParenthesizedTypeConverter<'a, 'b>(pub &'b TSParenthesizedType<'a>);

impl ESTree for TSParenthesizedTypeConverter<'_, '_> {
fn serialize<S: Serializer>(&self, serializer: S) {
let paren_type = self.0;
let mut state = serializer.serialize_struct();
state.serialize_field("type", &JsonSafeString("TSParenthesizedType"));
state.serialize_field("typeAnnotation", &paren_type.type_annotation);
state.serialize_span(paren_type.span);
state.end();
}
}
16 changes: 10 additions & 6 deletions napi/parser/generated/deserialize/js.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -1371,12 +1371,16 @@ function deserializeTSIntersectionType(pos) {
}

function deserializeTSParenthesizedType(pos) {
return {
type: 'TSParenthesizedType',
typeAnnotation: deserializeTSType(pos + 8),
start: deserializeU32(pos),
end: deserializeU32(pos + 4),
};
let node = deserializeTSType(pos + 8);
if (preserveParens) {
node = {
type: 'TSParenthesizedType',
typeAnnotation: node,
start: deserializeU32(pos),
end: deserializeU32(pos + 4),
};
}
return node;
}

function deserializeTSTypeOperator(pos) {
Expand Down
16 changes: 10 additions & 6 deletions napi/parser/generated/deserialize/ts.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -1502,12 +1502,16 @@ function deserializeTSIntersectionType(pos) {
}

function deserializeTSParenthesizedType(pos) {
return {
type: 'TSParenthesizedType',
typeAnnotation: deserializeTSType(pos + 8),
start: deserializeU32(pos),
end: deserializeU32(pos + 4),
};
let node = deserializeTSType(pos + 8);
if (preserveParens) {
node = {
type: 'TSParenthesizedType',
typeAnnotation: node,
start: deserializeU32(pos),
end: deserializeU32(pos + 4),
};
}
return node;
}

function deserializeTSTypeOperator(pos) {
Expand Down
6 changes: 4 additions & 2 deletions napi/parser/test/parse-raw.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -277,12 +277,13 @@ describe.concurrent('`preserveParens` option', () => {
});

it.concurrent('TS', async () => {
const code = 'let x = (1 + 2);';
const code = 'let x = (1 + 2); type T = (string);';

// @ts-ignore
let ret = parseSync('test.ts', code, { experimentalRawTransfer: true, preserveParens: false });
expect(ret.errors.length).toBe(0);
expect(ret.program.body[0].declarations[0].init.type).toBe('BinaryExpression');
expect(ret.program.body[1].typeAnnotation.type).toBe('TSStringKeyword');
});
});

Expand All @@ -297,12 +298,13 @@ describe.concurrent('`preserveParens` option', () => {
});

it.concurrent('TS', async () => {
const code = 'let x = (1 + 2);';
const code = 'let x = (1 + 2); type T = (string);';

// @ts-ignore
let ret = parseSync('test.ts', code, { experimentalRawTransfer: true, preserveParens: true });
expect(ret.errors.length).toBe(0);
expect(ret.program.body[0].declarations[0].init.type).toBe('ParenthesizedExpression');
expect(ret.program.body[1].typeAnnotation.type).toBe('TSParenthesizedType');
});
});
});
Loading