feat(napi/parser): preserveParens option for raw transfer

Author: overlookmotel

crates/oxc_ast/src/ast/js.rs

@@ -1069,6 +1069,7 @@ pub enum ChainElement<'a> {
 #[ast(visit)]
 #[derive(Debug)]
 #[generate_derive(CloneIn, Dummy, TakeIn, GetSpan, GetSpanMut, ContentEq, ESTree)]
+#[estree(via = ParenthesizedExpressionConverter)]
 pub struct ParenthesizedExpression<'a> {
     pub span: Span,
     pub expression: Expression<'a>,

crates/oxc_ast/src/generated/derive_estree.rs

@@ -773,11 +773,7 @@ impl ESTree for ChainElement<'_> {
 
 impl ESTree for ParenthesizedExpression<'_> {
     fn serialize<S: Serializer>(&self, serializer: S) {
-        let mut state = serializer.serialize_struct();
-        state.serialize_field("type", &JsonSafeString("ParenthesizedExpression"));
-        state.serialize_field("expression", &self.expression);
-        state.serialize_span(self.span);
-        state.end();
+        crate::serialize::js::ParenthesizedExpressionConverter(self).serialize(serializer)
     }
 }
 

crates/oxc_ast/src/serialize/js.rs

@@ -447,3 +447,38 @@ impl ESTree for AssignmentTargetPropertyIdentifierInit<'_> {
         }
     }
 }
+
+/// Converter for [`ParenthesizedExpression`].
+///
+/// In raw transfer, do not produce a `ParenthesizedExpression` 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[Expression](POS_OFFSET.expression);
+    if (preserveParens) {
+        node = {
+            type: 'ParenthesizedExpression',
+            expression: node,
+            start: DESER[u32]( POS_OFFSET.span.start ),
+            end: DESER[u32]( POS_OFFSET.span.end ),
+        };
+    }
+    node
+")]
+pub struct ParenthesizedExpressionConverter<'a, 'b>(pub &'b ParenthesizedExpression<'a>);
+
+impl ESTree for ParenthesizedExpressionConverter<'_, '_> {
+    fn serialize<S: Serializer>(&self, serializer: S) {
+        let paren_expr = self.0;
+        let mut state = serializer.serialize_struct();
+        state.serialize_field("type", &JsonSafeString("ParenthesizedExpression"));
+        state.serialize_field("expression", &paren_expr.expression);
+        state.serialize_span(paren_expr.span);
+        state.end();
+    }
+}

napi/parser/bench.bench.mjs

@@ -101,7 +101,7 @@ for (const { filename, code } of fixtures) {
     const deserialize = isJsAst(buffer) ? deserializeJS : deserializeTS;
 
     benchRaw('parser_napi_raw_deser_only', () => {
-      deserialize(buffer, code, sourceByteLen);
+      deserialize(buffer, code, sourceByteLen, true);
     });
 
     // oxlint-disable-next-line no-unused-vars

napi/parser/generated/deserialize/js.mjs

@@ -1,20 +1,21 @@
 // Auto-generated code, DO NOT EDIT DIRECTLY!
 // To edit this generated file you have to edit `tasks/ast_tools/src/generators/raw_transfer.rs`.
 
-let uint8, uint32, float64, sourceText, sourceIsAscii, sourceByteLen;
+let uint8, uint32, float64, sourceText, sourceIsAscii, sourceByteLen, preserveParens;
 
 const textDecoder = new TextDecoder('utf-8', { ignoreBOM: true }),
   decodeStr = textDecoder.decode.bind(textDecoder),
   { fromCodePoint } = String;
 
-export function deserialize(buffer, sourceTextInput, sourceByteLenInput) {
+export function deserialize(buffer, sourceTextInput, sourceByteLenInput, preserveParensInput) {
   uint8 = buffer;
   uint32 = buffer.uint32;
   float64 = buffer.float64;
 
   sourceText = sourceTextInput;
   sourceByteLen = sourceByteLenInput;
   sourceIsAscii = sourceText.length === sourceByteLen;
+  preserveParens = preserveParensInput;
 
   const data = deserializeRawTransferData(uint32[536870902]);
 
@@ -438,12 +439,16 @@ function deserializeChainExpression(pos) {
 }
 
 function deserializeParenthesizedExpression(pos) {
-  return {
-    type: 'ParenthesizedExpression',
-    expression: deserializeExpression(pos + 8),
-    start: deserializeU32(pos),
-    end: deserializeU32(pos + 4),
-  };
+  let node = deserializeExpression(pos + 8);
+  if (preserveParens) {
+    node = {
+      type: 'ParenthesizedExpression',
+      expression: node,
+      start: deserializeU32(pos),
+      end: deserializeU32(pos + 4),
+    };
+  }
+  return node;
 }
 
 function deserializeDirective(pos) {

napi/parser/generated/deserialize/ts.mjs

@@ -1,20 +1,21 @@
 // Auto-generated code, DO NOT EDIT DIRECTLY!
 // To edit this generated file you have to edit `tasks/ast_tools/src/generators/raw_transfer.rs`.
 
-let uint8, uint32, float64, sourceText, sourceIsAscii, sourceByteLen;
+let uint8, uint32, float64, sourceText, sourceIsAscii, sourceByteLen, preserveParens;
 
 const textDecoder = new TextDecoder('utf-8', { ignoreBOM: true }),
   decodeStr = textDecoder.decode.bind(textDecoder),
   { fromCodePoint } = String;
 
-export function deserialize(buffer, sourceTextInput, sourceByteLenInput) {
+export function deserialize(buffer, sourceTextInput, sourceByteLenInput, preserveParensInput) {
   uint8 = buffer;
   uint32 = buffer.uint32;
   float64 = buffer.float64;
 
   sourceText = sourceTextInput;
   sourceByteLen = sourceByteLenInput;
   sourceIsAscii = sourceText.length === sourceByteLen;
+  preserveParens = preserveParensInput;
 
   const data = deserializeRawTransferData(uint32[536870902]);
 
@@ -488,12 +489,16 @@ function deserializeChainExpression(pos) {
 }
 
 function deserializeParenthesizedExpression(pos) {
-  return {
-    type: 'ParenthesizedExpression',
-    expression: deserializeExpression(pos + 8),
-    start: deserializeU32(pos),
-    end: deserializeU32(pos + 4),
-  };
+  let node = deserializeExpression(pos + 8);
+  if (preserveParens) {
+    node = {
+      type: 'ParenthesizedExpression',
+      expression: node,
+      start: deserializeU32(pos),
+      end: deserializeU32(pos + 4),
+    };
+  }
+  return node;
 }
 
 function deserializeDirective(pos) {

napi/parser/raw-transfer/eager.mjs

@@ -56,7 +56,10 @@ function deserialize(buffer, sourceText, sourceByteLen) {
   let data;
   if (isJsAst(buffer)) {
     if (deserializeJS === null) deserializeJS = require('../generated/deserialize/js.mjs').deserialize;
-    data = deserializeJS(buffer, sourceText, sourceByteLen);
+
+    // `preserveParens` argument is unconditionally `true` here. If `options` contains `preserveParens: false`,
+    // `ParenthesizedExpression` nodes won't be in AST anyway, so the value is irrelevant.
+    data = deserializeJS(buffer, sourceText, sourceByteLen, true);
 
     // Add a line comment for hashbang
     const { hashbang } = data.program;
@@ -65,7 +68,11 @@ function deserialize(buffer, sourceText, sourceByteLen) {
     }
   } else {
     if (deserializeTS === null) deserializeTS = require('../generated/deserialize/ts.mjs').deserialize;
-    data = deserializeTS(buffer, sourceText, sourceByteLen);
+
+    // `preserveParens` argument is unconditionally `true` here. If `options` contains `preserveParens: false`,
+    // `ParenthesizedExpression` nodes won't be in AST anyway, so the value is irrelevant.
+    data = deserializeTS(buffer, sourceText, sourceByteLen, true);
+
     // Note: Do not add line comment for hashbang, to match `@typescript-eslint/parser`.
     // See https://github.com/oxc-project/oxc/blob/ea784f5f082e4c53c98afde9bf983afd0b95e44e/napi/parser/src/lib.rs#L106-L130
   }

tasks/ast_tools/src/generators/raw_transfer.rs

@@ -116,20 +116,21 @@ fn generate_deserializers(consts: Constants, schema: &Schema, codegen: &Codegen)
 
     #[rustfmt::skip]
     let prelude = format!("
-        let uint8, uint32, float64, sourceText, sourceIsAscii, sourceByteLen;
+        let uint8, uint32, float64, sourceText, sourceIsAscii, sourceByteLen, preserveParens;
 
         const textDecoder = new TextDecoder('utf-8', {{ ignoreBOM: true }}),
             decodeStr = textDecoder.decode.bind(textDecoder),
             {{ fromCodePoint }} = String;
 
-        export function deserialize(buffer, sourceTextInput, sourceByteLenInput) {{
+        export function deserialize(buffer, sourceTextInput, sourceByteLenInput, preserveParensInput) {{
             uint8 = buffer;
             uint32 = buffer.uint32;
             float64 = buffer.float64;
 
             sourceText = sourceTextInput;
             sourceByteLen = sourceByteLenInput;
             sourceIsAscii = sourceText.length === sourceByteLen;
+            preserveParens = preserveParensInput;
 
             const data = deserializeRawTransferData(uint32[{data_pointer_pos_32}]);