Add JSXElementChild -> JSXExprContainer and JSXEmptyExpr

rollup · lukastaegert · Oct 2, 2024 · Mar 1, 2024 · Mar 2, 2024 · Mar 2, 2024
commit 2baff98e96e187754c05293d5060ff0b8c53177b
diff --git a/rust/parse_ast/src/convert_ast/converter.rs b/rust/parse_ast/src/convert_ast/converter.rs
@@ -1,23 +1,24 @@
 use swc_common::Span;
 use swc_ecma_ast::{
   AssignTarget, AssignTargetPat, Callee, CallExpr, ClassMember, Decl, ExportSpecifier, Expr,
-  ExprOrSpread, ForHead, ImportSpecifier, JSXAttr, JSXAttrName, JSXAttrOrSpread,
-  JSXElement, JSXElementChild, JSXElementName, JSXOpeningElement, JSXText, Lit, ModuleDecl,
-  ModuleExportName, ModuleItem, NamedExport, ObjectPatProp, OptChainBase, ParenExpr, Pat, Program,
-  PropName, PropOrSpread, SimpleAssignTarget, Stmt, VarDeclOrExpr,
+  ExprOrSpread, ForHead, ImportSpecifier, JSXAttr, JSXAttrName, JSXAttrOrSpread, JSXElement,
+  JSXElementChild, JSXElementName, JSXEmptyExpr, JSXExpr, JSXExprContainer, JSXOpeningElement,
+  JSXText, Lit, ModuleDecl, ModuleExportName, ModuleItem, NamedExport, ObjectPatProp, OptChainBase,
+  ParenExpr, Pat, Program, PropName, PropOrSpread, SimpleAssignTarget, Stmt, VarDeclOrExpr,
 };
 
 use crate::ast_nodes::call_expression::StoredCallee;
 use crate::ast_nodes::variable_declaration::VariableDeclaration;
 use crate::convert_ast::annotations::{AnnotationKind, AnnotationWithType};
 use crate::convert_ast::converter::ast_constants::{
   JSX_ATTRIBUTE_NAME_OFFSET, JSX_ATTRIBUTE_RESERVED_BYTES, JSX_ELEMENT_CHILDREN_OFFSET,
-  JSX_ELEMENT_OPENING_ELEMENT_OFFSET, JSX_ELEMENT_RESERVED_BYTES, JSX_IDENTIFIER_NAME_OFFSET,
-  JSX_IDENTIFIER_RESERVED_BYTES, JSX_OPENING_ELEMENT_ATTRIBUTES_OFFSET,
+  JSX_ELEMENT_OPENING_ELEMENT_OFFSET, JSX_ELEMENT_RESERVED_BYTES, JSX_EMPTY_EXPR_RESERVED_BYTES,
+  JSX_EXPR_CONTAINER_EXPRESSION_OFFSET, JSX_EXPR_CONTAINER_RESERVED_BYTES,
+  JSX_IDENTIFIER_NAME_OFFSET, JSX_IDENTIFIER_RESERVED_BYTES, JSX_OPENING_ELEMENT_ATTRIBUTES_OFFSET,
   JSX_OPENING_ELEMENT_NAME_OFFSET, JSX_OPENING_ELEMENT_RESERVED_BYTES, JSX_TEXT_RESERVED_BYTES,
   JSX_TEXT_VALUE_OFFSET, TYPE_CLASS_EXPRESSION, TYPE_FUNCTION_DECLARATION,
-  TYPE_FUNCTION_EXPRESSION, TYPE_JSX_ATTRIBUTE, TYPE_JSX_ELEMENT, TYPE_JSX_IDENTIFIER,
-  TYPE_JSX_OPENING_ELEMENT, TYPE_JSX_TEXT,
+  TYPE_FUNCTION_EXPRESSION, TYPE_JSX_ATTRIBUTE, TYPE_JSX_ELEMENT, TYPE_JSX_EMPTY_EXPR,
+  TYPE_JSX_EXPR_CONTAINER, TYPE_JSX_IDENTIFIER, TYPE_JSX_OPENING_ELEMENT, TYPE_JSX_TEXT,
 };
 use crate::convert_ast::converter::string_constants::{
   STRING_NOSIDEEFFECTS, STRING_PURE, STRING_SOURCEMAP,
@@ -698,9 +699,8 @@ impl<'a> AstConverter<'a> {
       JSXElementChild::JSXText(jsx_text) => {
         self.store_jsx_text(jsx_text);
       }
-      JSXElementChild::JSXExprContainer(_jsx_expr_container) => {
-        // self.store_jsx_expr_container(jsx_expr_container);
-        unimplemented!("JSXElementChild::JSXExprContainer")
+      JSXElementChild::JSXExprContainer(jsx_expr_container) => {
+        self.store_jsx_expr_container(jsx_expr_container);
       }
       JSXElementChild::JSXSpreadChild(_jsx_spread_child) => {
         // self.store_jsx_spread_child(jsx_spread_child);
@@ -716,6 +716,38 @@ impl<'a> AstConverter<'a> {
     }
   }
 
+  fn store_jsx_expr_container(&mut self, jsx_expr_container: &JSXExprContainer) {
+    let end_position = self.add_type_and_start(
+      &TYPE_JSX_EXPR_CONTAINER,
+      &jsx_expr_container.span,
+      JSX_EXPR_CONTAINER_RESERVED_BYTES,
+      false,
+    );
+    // expression
+    self.update_reference_position(end_position + JSX_EXPR_CONTAINER_EXPRESSION_OFFSET);
+    match &jsx_expr_container.expr {
+      JSXExpr::Expr(expression) => {
+        self.convert_expression(expression);
+      }
+      JSXExpr::JSXEmptyExpr(jsx_empty_expr) => {
+        self.store_jsx_empty_expr(jsx_empty_expr);
+      }
+    }
+    // end
+    self.add_end(end_position, &jsx_expr_container.span);
+  }
+
+  fn store_jsx_empty_expr(&mut self, jsx_empty_expr: &JSXEmptyExpr) {
+    let end_position = self.add_type_and_start(
+      &TYPE_JSX_EMPTY_EXPR,
+      &jsx_empty_expr.span,
+      JSX_EMPTY_EXPR_RESERVED_BYTES,
+      false,
+    );
+    // end
+    self.add_end(end_position, &jsx_empty_expr.span);
+  }
+
   fn store_jsx_text(&mut self, jsx_text: &JSXText) {
     let end_position = self.add_type_and_start(
       &TYPE_JSX_TEXT,

diff --git a/rust/parse_ast/src/convert_ast/converter/ast_constants.rs b/rust/parse_ast/src/convert_ast/converter/ast_constants.rs
@@ -26,23 +26,25 @@ pub const TYPE_IMPORT_DECLARATION: [u8; 4] = 37u32.to_ne_bytes();
 pub const TYPE_IMPORT_EXPRESSION: [u8; 4] = 39u32.to_ne_bytes();
 pub const TYPE_JSX_ATTRIBUTE: [u8; 4] = 42u32.to_ne_bytes();
 pub const TYPE_JSX_ELEMENT: [u8; 4] = 43u32.to_ne_bytes();
-pub const TYPE_JSX_IDENTIFIER: [u8; 4] = 44u32.to_ne_bytes();
-pub const TYPE_JSX_OPENING_ELEMENT: [u8; 4] = 45u32.to_ne_bytes();
-pub const TYPE_JSX_TEXT: [u8; 4] = 46u32.to_ne_bytes();
-pub const TYPE_LOGICAL_EXPRESSION: [u8; 4] = 54u32.to_ne_bytes();
-pub const TYPE_MEMBER_EXPRESSION: [u8; 4] = 55u32.to_ne_bytes();
-pub const TYPE_META_PROPERTY: [u8; 4] = 56u32.to_ne_bytes();
-pub const TYPE_METHOD_DEFINITION: [u8; 4] = 57u32.to_ne_bytes();
-pub const TYPE_NEW_EXPRESSION: [u8; 4] = 58u32.to_ne_bytes();
-pub const TYPE_PROGRAM: [u8; 4] = 62u32.to_ne_bytes();
-pub const TYPE_PROPERTY: [u8; 4] = 63u32.to_ne_bytes();
-pub const TYPE_PROPERTY_DEFINITION: [u8; 4] = 64u32.to_ne_bytes();
-pub const TYPE_REST_ELEMENT: [u8; 4] = 65u32.to_ne_bytes();
-pub const TYPE_SPREAD_ELEMENT: [u8; 4] = 68u32.to_ne_bytes();
-pub const TYPE_TEMPLATE_LITERAL: [u8; 4] = 75u32.to_ne_bytes();
-pub const TYPE_TRY_STATEMENT: [u8; 4] = 78u32.to_ne_bytes();
-pub const TYPE_VARIABLE_DECLARATION: [u8; 4] = 81u32.to_ne_bytes();
-pub const TYPE_VARIABLE_DECLARATOR: [u8; 4] = 82u32.to_ne_bytes();
+pub const TYPE_JSX_EMPTY_EXPR: [u8; 4] = 44u32.to_ne_bytes();
+pub const TYPE_JSX_EXPR_CONTAINER: [u8; 4] = 45u32.to_ne_bytes();
+pub const TYPE_JSX_IDENTIFIER: [u8; 4] = 46u32.to_ne_bytes();
+pub const TYPE_JSX_OPENING_ELEMENT: [u8; 4] = 47u32.to_ne_bytes();
+pub const TYPE_JSX_TEXT: [u8; 4] = 48u32.to_ne_bytes();
+pub const TYPE_LOGICAL_EXPRESSION: [u8; 4] = 56u32.to_ne_bytes();
+pub const TYPE_MEMBER_EXPRESSION: [u8; 4] = 57u32.to_ne_bytes();
+pub const TYPE_META_PROPERTY: [u8; 4] = 58u32.to_ne_bytes();
+pub const TYPE_METHOD_DEFINITION: [u8; 4] = 59u32.to_ne_bytes();
+pub const TYPE_NEW_EXPRESSION: [u8; 4] = 60u32.to_ne_bytes();
+pub const TYPE_PROGRAM: [u8; 4] = 64u32.to_ne_bytes();
+pub const TYPE_PROPERTY: [u8; 4] = 65u32.to_ne_bytes();
+pub const TYPE_PROPERTY_DEFINITION: [u8; 4] = 66u32.to_ne_bytes();
+pub const TYPE_REST_ELEMENT: [u8; 4] = 67u32.to_ne_bytes();
+pub const TYPE_SPREAD_ELEMENT: [u8; 4] = 70u32.to_ne_bytes();
+pub const TYPE_TEMPLATE_LITERAL: [u8; 4] = 77u32.to_ne_bytes();
+pub const TYPE_TRY_STATEMENT: [u8; 4] = 80u32.to_ne_bytes();
+pub const TYPE_VARIABLE_DECLARATION: [u8; 4] = 83u32.to_ne_bytes();
+pub const TYPE_VARIABLE_DECLARATOR: [u8; 4] = 84u32.to_ne_bytes();
 
 pub const PANIC_ERROR_RESERVED_BYTES: usize = 8;
 pub const PANIC_ERROR_MESSAGE_OFFSET: usize = 4;
@@ -138,6 +140,11 @@ pub const JSX_ELEMENT_OPENING_ELEMENT_OFFSET: usize = 4;
 pub const JSX_ELEMENT_CLOSING_ELEMENT_OFFSET: usize = 8;
 pub const JSX_ELEMENT_CHILDREN_OFFSET: usize = 12;
 
+pub const JSX_EMPTY_EXPR_RESERVED_BYTES: usize = 4;
+
+pub const JSX_EXPR_CONTAINER_RESERVED_BYTES: usize = 8;
+pub const JSX_EXPR_CONTAINER_EXPRESSION_OFFSET: usize = 4;
+
 pub const JSX_IDENTIFIER_RESERVED_BYTES: usize = 8;
 pub const JSX_IDENTIFIER_NAME_OFFSET: usize = 4;
 

diff --git a/rust/parse_ast/src/convert_ast/converter/ast_macros.rs b/rust/parse_ast/src/convert_ast/converter/ast_macros.rs
@@ -319,7 +319,7 @@ macro_rules! store_import_specifier {
 macro_rules! store_labeled_statement {
   ($self:expr, span => $span:expr, label => [$label_value:expr, $label_converter:ident], body => [$body_value:expr, $body_converter:ident]) => {
     let _: &mut AstConverter = $self;
-    let end_position = $self.add_type_and_start(&47u32.to_ne_bytes(), &$span, 12, false);
+    let end_position = $self.add_type_and_start(&49u32.to_ne_bytes(), &$span, 12, false);
     // label
     $self.update_reference_position(end_position + 4);
     $self.$label_converter(&$label_value);
@@ -335,7 +335,7 @@ macro_rules! store_labeled_statement {
 macro_rules! store_literal_big_int {
   ($self:expr, span => $span:expr, bigint => $bigint_value:expr, raw => $raw_value:expr) => {
     let _: &mut AstConverter = $self;
-    let end_position = $self.add_type_and_start(&48u32.to_ne_bytes(), &$span, 12, false);
+    let end_position = $self.add_type_and_start(&50u32.to_ne_bytes(), &$span, 12, false);
     // bigint
     $self.convert_string($bigint_value, end_position + 4);
     // raw
@@ -350,7 +350,7 @@ macro_rules! store_literal_boolean {
   ($self:expr, span => $span:expr, value => $value_value:expr) => {
     let _: &mut AstConverter = $self;
     let end_position = $self.add_type_and_start(
-      &49u32.to_ne_bytes(),
+      &51u32.to_ne_bytes(),
       &$span,
       8,
       false,
@@ -366,7 +366,7 @@ macro_rules! store_literal_boolean {
 macro_rules! store_literal_null {
   ($self:expr, span => $span:expr) => {
     let _: &mut AstConverter = $self;
-    let end_position = $self.add_type_and_start(&50u32.to_ne_bytes(), &$span, 4, false);
+    let end_position = $self.add_type_and_start(&52u32.to_ne_bytes(), &$span, 4, false);
     // end
     $self.add_end(end_position, &$span);
   };
@@ -376,7 +376,7 @@ macro_rules! store_literal_null {
 macro_rules! store_literal_number {
   ($self:expr, span => $span:expr, raw => $raw_value:expr, value => $value_value:expr) => {
     let _: &mut AstConverter = $self;
-    let end_position = $self.add_type_and_start(&51u32.to_ne_bytes(), &$span, 16, false);
+    let end_position = $self.add_type_and_start(&53u32.to_ne_bytes(), &$span, 16, false);
     // raw
     if let Some(value) = $raw_value.as_ref() {
       $self.convert_string(value, end_position + 4);
@@ -393,7 +393,7 @@ macro_rules! store_literal_number {
 macro_rules! store_literal_reg_exp {
   ($self:expr, span => $span:expr, flags => $flags_value:expr, pattern => $pattern_value:expr) => {
     let _: &mut AstConverter = $self;
-    let end_position = $self.add_type_and_start(&52u32.to_ne_bytes(), &$span, 12, false);
+    let end_position = $self.add_type_and_start(&54u32.to_ne_bytes(), &$span, 12, false);
     // flags
     $self.convert_string($flags_value, end_position + 4);
     // pattern
@@ -407,7 +407,7 @@ macro_rules! store_literal_reg_exp {
 macro_rules! store_literal_string {
   ($self:expr, span => $span:expr, value => $value_value:expr, raw => $raw_value:expr) => {
     let _: &mut AstConverter = $self;
-    let end_position = $self.add_type_and_start(&53u32.to_ne_bytes(), &$span, 12, false);
+    let end_position = $self.add_type_and_start(&55u32.to_ne_bytes(), &$span, 12, false);
     // value
     $self.convert_string($value_value, end_position + 4);
     // raw
@@ -423,7 +423,7 @@ macro_rules! store_literal_string {
 macro_rules! store_object_expression {
   ($self:expr, span => $span:expr, properties => [$properties_value:expr, $properties_converter:ident]) => {
     let _: &mut AstConverter = $self;
-    let end_position = $self.add_type_and_start(&59u32.to_ne_bytes(), &$span, 8, false);
+    let end_position = $self.add_type_and_start(&61u32.to_ne_bytes(), &$span, 8, false);
     // properties
     $self.convert_item_list(
       &$properties_value,
@@ -442,7 +442,7 @@ macro_rules! store_object_expression {
 macro_rules! store_object_pattern {
   ($self:expr, span => $span:expr, properties => [$properties_value:expr, $properties_converter:ident]) => {
     let _: &mut AstConverter = $self;
-    let end_position = $self.add_type_and_start(&60u32.to_ne_bytes(), &$span, 8, false);
+    let end_position = $self.add_type_and_start(&62u32.to_ne_bytes(), &$span, 8, false);
     // properties
     $self.convert_item_list(
       &$properties_value,
@@ -461,7 +461,7 @@ macro_rules! store_object_pattern {
 macro_rules! store_private_identifier {
   ($self:expr, span => $span:expr, name => $name_value:expr) => {
     let _: &mut AstConverter = $self;
-    let end_position = $self.add_type_and_start(&61u32.to_ne_bytes(), &$span, 8, false);
+    let end_position = $self.add_type_and_start(&63u32.to_ne_bytes(), &$span, 8, false);
     // name
     $self.convert_string($name_value, end_position + 4);
     // end
@@ -473,7 +473,7 @@ macro_rules! store_private_identifier {
 macro_rules! store_return_statement {
   ($self:expr, span => $span:expr, argument => [$argument_value:expr, $argument_converter:ident]) => {
     let _: &mut AstConverter = $self;
-    let end_position = $self.add_type_and_start(&66u32.to_ne_bytes(), &$span, 8, false);
+    let end_position = $self.add_type_and_start(&68u32.to_ne_bytes(), &$span, 8, false);
     // argument
     if let Some(value) = $argument_value.as_ref() {
       $self.update_reference_position(end_position + 4);
@@ -488,7 +488,7 @@ macro_rules! store_return_statement {
 macro_rules! store_sequence_expression {
   ($self:expr, span => $span:expr, expressions => [$expressions_value:expr, $expressions_converter:ident]) => {
     let _: &mut AstConverter = $self;
-    let end_position = $self.add_type_and_start(&67u32.to_ne_bytes(), &$span, 8, false);
+    let end_position = $self.add_type_and_start(&69u32.to_ne_bytes(), &$span, 8, false);
     // expressions
     $self.convert_item_list(
       &$expressions_value,
@@ -507,7 +507,7 @@ macro_rules! store_sequence_expression {
 macro_rules! store_static_block {
   ($self:expr, span => $span:expr, body => [$body_value:expr, $body_converter:ident]) => {
     let _: &mut AstConverter = $self;
-    let end_position = $self.add_type_and_start(&69u32.to_ne_bytes(), &$span, 8, false);
+    let end_position = $self.add_type_and_start(&71u32.to_ne_bytes(), &$span, 8, false);
     // body
     $self.convert_item_list(&$body_value, end_position + 4, |ast_converter, node| {
       ast_converter.$body_converter(node);
@@ -522,7 +522,7 @@ macro_rules! store_static_block {
 macro_rules! store_super_element {
   ($self:expr, span => $span:expr) => {
     let _: &mut AstConverter = $self;
-    let end_position = $self.add_type_and_start(&70u32.to_ne_bytes(), &$span, 4, false);
+    let end_position = $self.add_type_and_start(&72u32.to_ne_bytes(), &$span, 4, false);
     // end
     $self.add_end(end_position, &$span);
   };
@@ -532,7 +532,7 @@ macro_rules! store_super_element {
 macro_rules! store_switch_case {
   ($self:expr, span => $span:expr, test => [$test_value:expr, $test_converter:ident], consequent => [$consequent_value:expr, $consequent_converter:ident]) => {
     let _: &mut AstConverter = $self;
-    let end_position = $self.add_type_and_start(&71u32.to_ne_bytes(), &$span, 12, false);
+    let end_position = $self.add_type_and_start(&73u32.to_ne_bytes(), &$span, 12, false);
     // test
     if let Some(value) = $test_value.as_ref() {
       $self.update_reference_position(end_position + 4);
@@ -556,7 +556,7 @@ macro_rules! store_switch_case {
 macro_rules! store_switch_statement {
   ($self:expr, span => $span:expr, discriminant => [$discriminant_value:expr, $discriminant_converter:ident], cases => [$cases_value:expr, $cases_converter:ident]) => {
     let _: &mut AstConverter = $self;
-    let end_position = $self.add_type_and_start(&72u32.to_ne_bytes(), &$span, 12, false);
+    let end_position = $self.add_type_and_start(&74u32.to_ne_bytes(), &$span, 12, false);
     // discriminant
     $self.update_reference_position(end_position + 4);
     $self.$discriminant_converter(&$discriminant_value);
@@ -574,7 +574,7 @@ macro_rules! store_switch_statement {
 macro_rules! store_tagged_template_expression {
   ($self:expr, span => $span:expr, tag => [$tag_value:expr, $tag_converter:ident], quasi => [$quasi_value:expr, $quasi_converter:ident]) => {
     let _: &mut AstConverter = $self;
-    let end_position = $self.add_type_and_start(&73u32.to_ne_bytes(), &$span, 12, false);
+    let end_position = $self.add_type_and_start(&75u32.to_ne_bytes(), &$span, 12, false);
     // tag
     $self.update_reference_position(end_position + 4);
     $self.$tag_converter(&$tag_value);
@@ -591,7 +591,7 @@ macro_rules! store_template_element {
   ($self:expr, span => $span:expr, tail => $tail_value:expr, cooked => $cooked_value:expr, raw => $raw_value:expr) => {
     let _: &mut AstConverter = $self;
     let end_position = $self.add_type_and_start(
-      &74u32.to_ne_bytes(),
+      &76u32.to_ne_bytes(),
       &$span,
       16,
       false,
@@ -613,7 +613,7 @@ macro_rules! store_template_element {
 macro_rules! store_this_expression {
   ($self:expr, span => $span:expr) => {
     let _: &mut AstConverter = $self;
-    let end_position = $self.add_type_and_start(&76u32.to_ne_bytes(), &$span, 4, false);
+    let end_position = $self.add_type_and_start(&78u32.to_ne_bytes(), &$span, 4, false);
     // end
     $self.add_end(end_position, &$span);
   };
@@ -623,7 +623,7 @@ macro_rules! store_this_expression {
 macro_rules! store_throw_statement {
   ($self:expr, span => $span:expr, argument => [$argument_value:expr, $argument_converter:ident]) => {
     let _: &mut AstConverter = $self;
-    let end_position = $self.add_type_and_start(&77u32.to_ne_bytes(), &$span, 8, false);
+    let end_position = $self.add_type_and_start(&79u32.to_ne_bytes(), &$span, 8, false);
     // argument
     $self.update_reference_position(end_position + 4);
     $self.$argument_converter(&$argument_value);
@@ -636,7 +636,7 @@ macro_rules! store_throw_statement {
 macro_rules! store_unary_expression {
   ($self:expr, span => $span:expr, operator => $operator_value:expr, argument => [$argument_value:expr, $argument_converter:ident]) => {
     let _: &mut AstConverter = $self;
-    let end_position = $self.add_type_and_start(&79u32.to_ne_bytes(), &$span, 12, false);
+    let end_position = $self.add_type_and_start(&81u32.to_ne_bytes(), &$span, 12, false);
     // operator
     let operator_position = end_position + 4;
     $self.buffer[operator_position..operator_position + 4].copy_from_slice($operator_value);
@@ -653,7 +653,7 @@ macro_rules! store_update_expression {
   ($self:expr, span => $span:expr, prefix => $prefix_value:expr, operator => $operator_value:expr, argument => [$argument_value:expr, $argument_converter:ident]) => {
     let _: &mut AstConverter = $self;
     let end_position = $self.add_type_and_start(
-      &80u32.to_ne_bytes(),
+      &82u32.to_ne_bytes(),
       &$span,
       16,
       false,
@@ -675,7 +675,7 @@ macro_rules! store_update_expression {
 macro_rules! store_while_statement {
   ($self:expr, span => $span:expr, test => [$test_value:expr, $test_converter:ident], body => [$body_value:expr, $body_converter:ident]) => {
     let _: &mut AstConverter = $self;
-    let end_position = $self.add_type_and_start(&83u32.to_ne_bytes(), &$span, 12, false);
+    let end_position = $self.add_type_and_start(&85u32.to_ne_bytes(), &$span, 12, false);
     // test
     $self.update_reference_position(end_position + 4);
     $self.$test_converter(&$test_value);
@@ -692,7 +692,7 @@ macro_rules! store_yield_expression {
   ($self:expr, span => $span:expr, delegate => $delegate_value:expr, argument => [$argument_value:expr, $argument_converter:ident]) => {
     let _: &mut AstConverter = $self;
     let end_position = $self.add_type_and_start(
-      &84u32.to_ne_bytes(),
+      &86u32.to_ne_bytes(),
       &$span,
       12,
       false,

diff --git a/scripts/ast-types.js b/scripts/ast-types.js
@@ -405,6 +405,15 @@ export const AST_NODES = {
 		],
 		useMacro: false
 	},
+	JsxEmptyExpr: {
+		estreeType: 'any',
+		useMacro: false
+	},
+	JsxExprContainer: {
+		estreeType: 'any',
+		fields: [['expression', 'Node']],
+		useMacro: false
+	},
 	JsxIdentifier: {
 		estreeType: 'any',
 		fields: [['name', 'String']],