{"commit":{"revision":"f452ed2971846dba5d6536f3752a861bba637603","subject":"[rust] estree support for jsx","authorName":"Joe Savona","authorEmail":"joesavona@fb.com","authoredAt":"2023-07-11T14:08:46+09:00","shortRevision":"f452ed2971"},"patch":"diff --git a\/compiler\/forget\/crates\/estree-codegen\/src\/ecmascript.json b\/compiler\/forget\/crates\/estree-codegen\/src\/ecmascript.json\nindex d3384b67ac..983b21a10f 100644\n--- a\/compiler\/forget\/crates\/estree-codegen\/src\/ecmascript.json\n+++ b\/compiler\/forget\/crates\/estree-codegen\/src\/ecmascript.json\n@@ -530,7 +530,129 @@\n \"type\": \"Identifier\"\n }\n }\n- }\n+ },\n+ \"JSXIdentifier\": {\n+ \"fields\": {\n+ \"name\": {\n+ \"type\": \"String\"\n+ }\n+ }\n+ },\n+ \"JSXNamespacedName\": {\n+ \"fields\": {\n+ \"namespace\": {\n+ \"type\": \"JSXIdentifier\"\n+ },\n+ \"name\": {\n+ \"type\": \"JSXIdentifier\"\n+ }\n+ }\n+ },\n+ \"JSXMemberExpression\": {\n+ \"fields\": {\n+ \"object\": {\n+ \"type\": \"JSXMemberExpressionOrIdentifier\"\n+ },\n+ \"property\": {\n+ \"type\": \"JSXIdentifier\"\n+ }\n+ }\n+ },\n+ \"JSXEmptyExpression\": {},\n+ \"JSXExpressionContainer\": {\n+ \"fields\": {\n+ \"expression\": {\n+ \"type\": \"JSXExpressionOrEmpty\"\n+ }\n+ }\n+ },\n+ \"JSXSpreadChild\": {\n+ \"fields\": {\n+ \"expression\": {\n+ \"type\": \"Expression\"\n+ }\n+ }\n+ },\n+ \"JSXOpeningElement\": {\n+ \"fields\": {\n+ \"name\": {\n+ \"type\": \"JSXElementName\"\n+ },\n+ \"attributes\": {\n+ \"type\": \"Vec\"\n+ },\n+ \"self_closing\": {\n+ \"type\": \"bool\",\n+ \"rename\": \"selfClosing\"\n+ }\n+ }\n+ },\n+ \"JSXClosingElement\": {\n+ \"fields\": {\n+ \"name\": {\n+ \"type\": \"JSXElementName\"\n+ }\n+ }\n+ },\n+ \"JSXAttribute\": {\n+ \"fields\": {\n+ \"name\": {\n+ \"type\": \"JSXIdentifierOrNamespacedName\"\n+ },\n+ \"value\": {\n+ \"type\": \"Option\"\n+ }\n+ }\n+ },\n+ \"JSXSpreadAttribute\": {\n+ \"fields\": {\n+ \"argument\": {\n+ \"type\": \"Expression\"\n+ }\n+ }\n+ },\n+ \"JSXText\": {\n+ \"fields\": {\n+ \"value\": {\n+ \"type\": \"String\"\n+ },\n+ \"raw\": {\n+ \"type\": \"String\"\n+ }\n+ }\n+ },\n+ \"JSXElement\": {\n+ \"fields\": {\n+ \"opening_element\": {\n+ \"type\": \"JSXOpeningElement\",\n+ \"rename\": \"openingElement\"\n+ },\n+ \"children\": {\n+ \"type\": \"Vec\"\n+ },\n+ \"closing_element\": {\n+ \"type\": \"Option\",\n+ \"rename\": \"closingElement\"\n+ }\n+ }\n+ },\n+ \"JSXFragment\": {\n+ \"fields\": {\n+ \"opening_fragment\": {\n+ \"type\": \"JSXOpeningFragment\",\n+ \"rename\": \"openingFragment\"\n+ },\n+ \"children\": {\n+ \"type\": \"Vec\"\n+ },\n+ \"closing_fragment\": {\n+ \"type\": \"Option\",\n+ \"rename\": \"closingFragment\"\n+ }\n+ }\n+ },\n+ \"JSXOpeningFragment\": {},\n+ \"JSXClosingFragment\": {}\n },\n \"enums\": {\n \"Statement\": [\n@@ -573,7 +695,8 @@\n \"ThisExpression\",\n \"UnaryExpression\",\n \"UpdateExpression\",\n- \"YieldExpression\"\n+ \"YieldExpression\",\n+ \"JSXElement\"\n ],\n \"ImportDeclarationSpecifier\": [\n \"ImportSpecifier\",\n@@ -617,6 +740,40 @@\n \"AssignmentTarget\": [\n \"Expression\",\n \"Pattern\"\n+ ],\n+ \"JSXMemberExpressionOrIdentifier\": [\n+ \"JSXMemberExpression\",\n+ \"JSXIdentifier\"\n+ ],\n+ \"JSXExpressionOrEmpty\": [\n+ \"Expression\",\n+ \"JSXEmptyExpression\"\n+ ],\n+ \"JSXAttributeOrSpread\": [\n+ \"JSXAttribute\",\n+ \"JSXSpreadAttribute\"\n+ ],\n+ \"JSXAttributeValue\": [\n+ \"Literal\",\n+ \"JSXExpressionContainer\",\n+ \"JSXElement\",\n+ \"JSXFragment\"\n+ ],\n+ \"JSXElementName\": [\n+ \"JSXIdentifier\",\n+ \"JSXMemberExpression\",\n+ \"JSXNamespacedName\"\n+ ],\n+ \"JSXIdentifierOrNamespacedName\": [\n+ \"JSXIdentifier\",\n+ \"JSXNamespacedName\"\n+ ],\n+ \"JSXChildItem\": [\n+ \"JSXText\", \n+ \"JSXExpressionContainer\",\n+ \"JSXSpreadChild\",\n+ \"JSXElement\",\n+ \"JSXFragment\"\n ]\n },\n \"operators\": {\ndiff --git a\/compiler\/forget\/crates\/estree\/src\/generated.rs b\/compiler\/forget\/crates\/estree\/src\/generated.rs\nindex 3f269fc132..7f88894ea4 100644\n--- a\/compiler\/forget\/crates\/estree\/src\/generated.rs\n+++ b\/compiler\/forget\/crates\/estree\/src\/generated.rs\n@@ -477,6 +477,138 @@ pub struct ImportNamespaceSpecifier {\n #[serde(default)]\n pub range: Option,\n }\n+#[derive(Serialize, Deserialize, Clone, Debug)]\n+pub struct JSXIdentifier {\n+ pub name: String,\n+ #[serde(default)]\n+ pub loc: Option,\n+ #[serde(default)]\n+ pub range: Option,\n+}\n+#[derive(Serialize, Deserialize, Clone, Debug)]\n+pub struct JSXNamespacedName {\n+ pub namespace: JSXIdentifier,\n+ pub name: JSXIdentifier,\n+ #[serde(default)]\n+ pub loc: Option,\n+ #[serde(default)]\n+ pub range: Option,\n+}\n+#[derive(Serialize, Deserialize, Clone, Debug)]\n+pub struct JSXMemberExpression {\n+ pub object: JSXMemberExpressionOrIdentifier,\n+ pub property: JSXIdentifier,\n+ #[serde(default)]\n+ pub loc: Option,\n+ #[serde(default)]\n+ pub range: Option,\n+}\n+#[derive(Serialize, Deserialize, Clone, Debug)]\n+pub struct JSXEmptyExpression {\n+ #[serde(default)]\n+ pub loc: Option,\n+ #[serde(default)]\n+ pub range: Option,\n+}\n+#[derive(Serialize, Deserialize, Clone, Debug)]\n+pub struct JSXExpressionContainer {\n+ pub expression: JSXExpressionOrEmpty,\n+ #[serde(default)]\n+ pub loc: Option,\n+ #[serde(default)]\n+ pub range: Option,\n+}\n+#[derive(Serialize, Deserialize, Clone, Debug)]\n+pub struct JSXSpreadChild {\n+ pub expression: Expression,\n+ #[serde(default)]\n+ pub loc: Option,\n+ #[serde(default)]\n+ pub range: Option,\n+}\n+#[derive(Serialize, Deserialize, Clone, Debug)]\n+pub struct JSXOpeningElement {\n+ pub name: JSXElementName,\n+ pub attributes: Vec,\n+ #[serde(rename = \"selfClosing\")]\n+ pub self_closing: bool,\n+ #[serde(default)]\n+ pub loc: Option,\n+ #[serde(default)]\n+ pub range: Option,\n+}\n+#[derive(Serialize, Deserialize, Clone, Debug)]\n+pub struct JSXClosingElement {\n+ pub name: JSXElementName,\n+ #[serde(default)]\n+ pub loc: Option,\n+ #[serde(default)]\n+ pub range: Option,\n+}\n+#[derive(Serialize, Deserialize, Clone, Debug)]\n+pub struct JSXAttribute {\n+ pub name: JSXIdentifierOrNamespacedName,\n+ pub value: Option,\n+ #[serde(default)]\n+ pub loc: Option,\n+ #[serde(default)]\n+ pub range: Option,\n+}\n+#[derive(Serialize, Deserialize, Clone, Debug)]\n+pub struct JSXSpreadAttribute {\n+ pub argument: Expression,\n+ #[serde(default)]\n+ pub loc: Option,\n+ #[serde(default)]\n+ pub range: Option,\n+}\n+#[derive(Serialize, Deserialize, Clone, Debug)]\n+pub struct JSXText {\n+ pub value: String,\n+ pub raw: String,\n+ #[serde(default)]\n+ pub loc: Option,\n+ #[serde(default)]\n+ pub range: Option,\n+}\n+#[derive(Serialize, Deserialize, Clone, Debug)]\n+pub struct JSXElement {\n+ #[serde(rename = \"openingElement\")]\n+ pub opening_element: JSXOpeningElement,\n+ pub children: Vec,\n+ #[serde(rename = \"closingElement\")]\n+ pub closing_element: Option,\n+ #[serde(default)]\n+ pub loc: Option,\n+ #[serde(default)]\n+ pub range: Option,\n+}\n+#[derive(Serialize, Deserialize, Clone, Debug)]\n+pub struct JSXFragment {\n+ #[serde(rename = \"openingFragment\")]\n+ pub opening_fragment: JSXOpeningFragment,\n+ pub children: Vec,\n+ #[serde(rename = \"closingFragment\")]\n+ pub closing_fragment: Option,\n+ #[serde(default)]\n+ pub loc: Option,\n+ #[serde(default)]\n+ pub range: Option,\n+}\n+#[derive(Serialize, Deserialize, Clone, Debug)]\n+pub struct JSXOpeningFragment {\n+ #[serde(default)]\n+ pub loc: Option,\n+ #[serde(default)]\n+ pub range: Option,\n+}\n+#[derive(Serialize, Deserialize, Clone, Debug)]\n+pub struct JSXClosingFragment {\n+ #[serde(default)]\n+ pub loc: Option,\n+ #[serde(default)]\n+ pub range: Option,\n+}\n #[derive(Serialize, Clone, Debug)]\n #[serde(tag = \"type\")]\n pub enum Statement {\n@@ -710,6 +842,7 @@ pub enum Expression {\n ConditionalExpression(Box),\n FunctionExpression(Box),\n Identifier(Box),\n+ JSXElement(Box),\n Literal(Box),\n LogicalExpression(Box),\n MemberExpression(Box),\n@@ -741,6 +874,7 @@ enum __ExpressionTag {\n UnaryExpression,\n UpdateExpression,\n YieldExpression,\n+ JSXElement,\n }\n impl<'de> serde::Deserialize<'de> for Expression {\n fn deserialize(deserializer: D) -> Result\n@@ -898,6 +1032,14 @@ impl<'de> serde::Deserialize<'de> for Expression {\n )?;\n Ok(Expression::YieldExpression(node))\n }\n+ __ExpressionTag::JSXElement => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(Expression::JSXElement(node))\n+ }\n }\n }\n }\n@@ -1228,6 +1370,7 @@ enum __ExpressionOrSuperTag {\n UnaryExpression,\n UpdateExpression,\n YieldExpression,\n+ JSXElement,\n Super,\n }\n impl<'de> serde::Deserialize<'de> for ExpressionOrSuper {\n@@ -1394,6 +1537,14 @@ impl<'de> serde::Deserialize<'de> for ExpressionOrSuper {\n )?;\n Ok(ExpressionOrSuper::Expression(Expression::YieldExpression(node)))\n }\n+ __ExpressionOrSuperTag::JSXElement => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(ExpressionOrSuper::Expression(Expression::JSXElement(node)))\n+ }\n __ExpressionOrSuperTag::Super => {\n let node: Box = serde::Deserialize<'de> for ExpressionOrSpread {\n@@ -1601,6 +1753,14 @@ impl<'de> serde::Deserialize<'de> for ExpressionOrSpread {\n )?;\n Ok(ExpressionOrSpread::Expression(Expression::YieldExpression(node)))\n }\n+ __ExpressionOrSpreadTag::JSXElement => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(ExpressionOrSpread::Expression(Expression::JSXElement(node)))\n+ }\n __ExpressionOrSpreadTag::SpreadElement => {\n let node: Box = serde::Deserialize<'de> for FunctionBody {\n fn deserialize(deserializer: D) -> Result\n@@ -1804,6 +1965,14 @@ impl<'de> serde::Deserialize<'de> for FunctionBody {\n )?;\n Ok(FunctionBody::Expression(Expression::YieldExpression(node)))\n }\n+ __FunctionBodyTag::JSXElement => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(FunctionBody::Expression(Expression::JSXElement(node)))\n+ }\n }\n }\n }\n@@ -1865,6 +2034,7 @@ enum __ForInitTag {\n UnaryExpression,\n UpdateExpression,\n YieldExpression,\n+ JSXElement,\n VariableDeclaration,\n }\n impl<'de> serde::Deserialize<'de> for ForInit {\n@@ -2023,6 +2193,14 @@ impl<'de> serde::Deserialize<'de> for ForInit {\n )?;\n Ok(ForInit::Expression(Expression::YieldExpression(node)))\n }\n+ __ForInitTag::JSXElement => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(ForInit::Expression(Expression::JSXElement(node)))\n+ }\n __ForInitTag::VariableDeclaration => {\n let node: Box = serde::Deserialize<'de> for AssignmentTarget {\n fn deserialize(deserializer: D) -> Result\n@@ -2305,6 +2484,550 @@ impl<'de> serde::Deserialize<'de> for AssignmentTarget {\n )?;\n Ok(AssignmentTarget::Expression(Expression::YieldExpression(node)))\n }\n+ __AssignmentTargetTag::JSXElement => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(AssignmentTarget::Expression(Expression::JSXElement(node)))\n+ }\n+ }\n+ }\n+}\n+#[derive(Serialize, Clone, Debug)]\n+#[serde(tag = \"type\")]\n+pub enum JSXMemberExpressionOrIdentifier {\n+ JSXIdentifier(Box),\n+ JSXMemberExpression(Box),\n+}\n+#[derive(Deserialize, Debug)]\n+enum __JSXMemberExpressionOrIdentifierTag {\n+ JSXMemberExpression,\n+ JSXIdentifier,\n+}\n+impl<'de> serde::Deserialize<'de> for JSXMemberExpressionOrIdentifier {\n+ fn deserialize(deserializer: D) -> Result\n+ where\n+ D: serde::Deserializer<'de>,\n+ {\n+ let tagged = serde::Deserializer::deserialize_any(\n+ deserializer,\n+ serde::__private::de::TaggedContentVisitor::<\n+ __JSXMemberExpressionOrIdentifierTag,\n+ >::new(\"type\", \"Pattern\"),\n+ )?;\n+ match tagged.0 {\n+ __JSXMemberExpressionOrIdentifierTag::JSXMemberExpression => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXMemberExpressionOrIdentifier::JSXMemberExpression(node))\n+ }\n+ __JSXMemberExpressionOrIdentifierTag::JSXIdentifier => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXMemberExpressionOrIdentifier::JSXIdentifier(node))\n+ }\n+ }\n+ }\n+}\n+#[derive(Serialize, Clone, Debug)]\n+#[serde(untagged)]\n+pub enum JSXExpressionOrEmpty {\n+ Expression(Expression),\n+ JSXEmptyExpression(Box),\n+}\n+#[derive(Deserialize, Debug)]\n+enum __JSXExpressionOrEmptyTag {\n+ ArrayExpression,\n+ ArrowFunctionExpression,\n+ AssignmentExpression,\n+ BinaryExpression,\n+ CallExpression,\n+ ConditionalExpression,\n+ FunctionExpression,\n+ Identifier,\n+ Literal,\n+ LogicalExpression,\n+ MemberExpression,\n+ NewExpression,\n+ ObjectExpression,\n+ SequenceExpression,\n+ ThisExpression,\n+ UnaryExpression,\n+ UpdateExpression,\n+ YieldExpression,\n+ JSXElement,\n+ JSXEmptyExpression,\n+}\n+impl<'de> serde::Deserialize<'de> for JSXExpressionOrEmpty {\n+ fn deserialize(deserializer: D) -> Result\n+ where\n+ D: serde::Deserializer<'de>,\n+ {\n+ let tagged = serde::Deserializer::deserialize_any(\n+ deserializer,\n+ serde::__private::de::TaggedContentVisitor::<\n+ __JSXExpressionOrEmptyTag,\n+ >::new(\"type\", \"Pattern\"),\n+ )?;\n+ match tagged.0 {\n+ __JSXExpressionOrEmptyTag::ArrayExpression => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXExpressionOrEmpty::Expression(Expression::ArrayExpression(node)))\n+ }\n+ __JSXExpressionOrEmptyTag::ArrowFunctionExpression => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(\n+ JSXExpressionOrEmpty::Expression(\n+ Expression::ArrowFunctionExpression(node),\n+ ),\n+ )\n+ }\n+ __JSXExpressionOrEmptyTag::AssignmentExpression => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(\n+ JSXExpressionOrEmpty::Expression(\n+ Expression::AssignmentExpression(node),\n+ ),\n+ )\n+ }\n+ __JSXExpressionOrEmptyTag::BinaryExpression => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXExpressionOrEmpty::Expression(Expression::BinaryExpression(node)))\n+ }\n+ __JSXExpressionOrEmptyTag::CallExpression => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXExpressionOrEmpty::Expression(Expression::CallExpression(node)))\n+ }\n+ __JSXExpressionOrEmptyTag::ConditionalExpression => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(\n+ JSXExpressionOrEmpty::Expression(\n+ Expression::ConditionalExpression(node),\n+ ),\n+ )\n+ }\n+ __JSXExpressionOrEmptyTag::FunctionExpression => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(\n+ JSXExpressionOrEmpty::Expression(\n+ Expression::FunctionExpression(node),\n+ ),\n+ )\n+ }\n+ __JSXExpressionOrEmptyTag::Identifier => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXExpressionOrEmpty::Expression(Expression::Identifier(node)))\n+ }\n+ __JSXExpressionOrEmptyTag::Literal => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXExpressionOrEmpty::Expression(Expression::Literal(node)))\n+ }\n+ __JSXExpressionOrEmptyTag::LogicalExpression => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXExpressionOrEmpty::Expression(Expression::LogicalExpression(node)))\n+ }\n+ __JSXExpressionOrEmptyTag::MemberExpression => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXExpressionOrEmpty::Expression(Expression::MemberExpression(node)))\n+ }\n+ __JSXExpressionOrEmptyTag::NewExpression => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXExpressionOrEmpty::Expression(Expression::NewExpression(node)))\n+ }\n+ __JSXExpressionOrEmptyTag::ObjectExpression => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXExpressionOrEmpty::Expression(Expression::ObjectExpression(node)))\n+ }\n+ __JSXExpressionOrEmptyTag::SequenceExpression => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(\n+ JSXExpressionOrEmpty::Expression(\n+ Expression::SequenceExpression(node),\n+ ),\n+ )\n+ }\n+ __JSXExpressionOrEmptyTag::ThisExpression => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXExpressionOrEmpty::Expression(Expression::ThisExpression(node)))\n+ }\n+ __JSXExpressionOrEmptyTag::UnaryExpression => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXExpressionOrEmpty::Expression(Expression::UnaryExpression(node)))\n+ }\n+ __JSXExpressionOrEmptyTag::UpdateExpression => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXExpressionOrEmpty::Expression(Expression::UpdateExpression(node)))\n+ }\n+ __JSXExpressionOrEmptyTag::YieldExpression => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXExpressionOrEmpty::Expression(Expression::YieldExpression(node)))\n+ }\n+ __JSXExpressionOrEmptyTag::JSXElement => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXExpressionOrEmpty::Expression(Expression::JSXElement(node)))\n+ }\n+ __JSXExpressionOrEmptyTag::JSXEmptyExpression => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXExpressionOrEmpty::JSXEmptyExpression(node))\n+ }\n+ }\n+ }\n+}\n+#[derive(Serialize, Clone, Debug)]\n+#[serde(tag = \"type\")]\n+pub enum JSXAttributeOrSpread {\n+ JSXAttribute(Box),\n+ JSXSpreadAttribute(Box),\n+}\n+#[derive(Deserialize, Debug)]\n+enum __JSXAttributeOrSpreadTag {\n+ JSXAttribute,\n+ JSXSpreadAttribute,\n+}\n+impl<'de> serde::Deserialize<'de> for JSXAttributeOrSpread {\n+ fn deserialize(deserializer: D) -> Result\n+ where\n+ D: serde::Deserializer<'de>,\n+ {\n+ let tagged = serde::Deserializer::deserialize_any(\n+ deserializer,\n+ serde::__private::de::TaggedContentVisitor::<\n+ __JSXAttributeOrSpreadTag,\n+ >::new(\"type\", \"Pattern\"),\n+ )?;\n+ match tagged.0 {\n+ __JSXAttributeOrSpreadTag::JSXAttribute => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXAttributeOrSpread::JSXAttribute(node))\n+ }\n+ __JSXAttributeOrSpreadTag::JSXSpreadAttribute => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXAttributeOrSpread::JSXSpreadAttribute(node))\n+ }\n+ }\n+ }\n+}\n+#[derive(Serialize, Clone, Debug)]\n+#[serde(tag = \"type\")]\n+pub enum JSXAttributeValue {\n+ JSXElement(Box),\n+ JSXExpressionContainer(Box),\n+ JSXFragment(Box),\n+ Literal(Box),\n+}\n+#[derive(Deserialize, Debug)]\n+enum __JSXAttributeValueTag {\n+ Literal,\n+ JSXExpressionContainer,\n+ JSXElement,\n+ JSXFragment,\n+}\n+impl<'de> serde::Deserialize<'de> for JSXAttributeValue {\n+ fn deserialize(deserializer: D) -> Result\n+ where\n+ D: serde::Deserializer<'de>,\n+ {\n+ let tagged = serde::Deserializer::deserialize_any(\n+ deserializer,\n+ serde::__private::de::TaggedContentVisitor::<\n+ __JSXAttributeValueTag,\n+ >::new(\"type\", \"Pattern\"),\n+ )?;\n+ match tagged.0 {\n+ __JSXAttributeValueTag::Literal => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXAttributeValue::Literal(node))\n+ }\n+ __JSXAttributeValueTag::JSXExpressionContainer => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXAttributeValue::JSXExpressionContainer(node))\n+ }\n+ __JSXAttributeValueTag::JSXElement => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXAttributeValue::JSXElement(node))\n+ }\n+ __JSXAttributeValueTag::JSXFragment => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXAttributeValue::JSXFragment(node))\n+ }\n+ }\n+ }\n+}\n+#[derive(Serialize, Clone, Debug)]\n+#[serde(tag = \"type\")]\n+pub enum JSXElementName {\n+ JSXIdentifier(Box),\n+ JSXMemberExpression(Box),\n+ JSXNamespacedName(Box),\n+}\n+#[derive(Deserialize, Debug)]\n+enum __JSXElementNameTag {\n+ JSXIdentifier,\n+ JSXMemberExpression,\n+ JSXNamespacedName,\n+}\n+impl<'de> serde::Deserialize<'de> for JSXElementName {\n+ fn deserialize(deserializer: D) -> Result\n+ where\n+ D: serde::Deserializer<'de>,\n+ {\n+ let tagged = serde::Deserializer::deserialize_any(\n+ deserializer,\n+ serde::__private::de::TaggedContentVisitor::<\n+ __JSXElementNameTag,\n+ >::new(\"type\", \"Pattern\"),\n+ )?;\n+ match tagged.0 {\n+ __JSXElementNameTag::JSXIdentifier => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXElementName::JSXIdentifier(node))\n+ }\n+ __JSXElementNameTag::JSXMemberExpression => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXElementName::JSXMemberExpression(node))\n+ }\n+ __JSXElementNameTag::JSXNamespacedName => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXElementName::JSXNamespacedName(node))\n+ }\n+ }\n+ }\n+}\n+#[derive(Serialize, Clone, Debug)]\n+#[serde(tag = \"type\")]\n+pub enum JSXIdentifierOrNamespacedName {\n+ JSXIdentifier(Box),\n+ JSXNamespacedName(Box),\n+}\n+#[derive(Deserialize, Debug)]\n+enum __JSXIdentifierOrNamespacedNameTag {\n+ JSXIdentifier,\n+ JSXNamespacedName,\n+}\n+impl<'de> serde::Deserialize<'de> for JSXIdentifierOrNamespacedName {\n+ fn deserialize(deserializer: D) -> Result\n+ where\n+ D: serde::Deserializer<'de>,\n+ {\n+ let tagged = serde::Deserializer::deserialize_any(\n+ deserializer,\n+ serde::__private::de::TaggedContentVisitor::<\n+ __JSXIdentifierOrNamespacedNameTag,\n+ >::new(\"type\", \"Pattern\"),\n+ )?;\n+ match tagged.0 {\n+ __JSXIdentifierOrNamespacedNameTag::JSXIdentifier => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXIdentifierOrNamespacedName::JSXIdentifier(node))\n+ }\n+ __JSXIdentifierOrNamespacedNameTag::JSXNamespacedName => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXIdentifierOrNamespacedName::JSXNamespacedName(node))\n+ }\n+ }\n+ }\n+}\n+#[derive(Serialize, Clone, Debug)]\n+#[serde(tag = \"type\")]\n+pub enum JSXChildItem {\n+ JSXElement(Box),\n+ JSXExpressionContainer(Box),\n+ JSXFragment(Box),\n+ JSXSpreadChild(Box),\n+ JSXText(Box),\n+}\n+#[derive(Deserialize, Debug)]\n+enum __JSXChildItemTag {\n+ JSXText,\n+ JSXExpressionContainer,\n+ JSXSpreadChild,\n+ JSXElement,\n+ JSXFragment,\n+}\n+impl<'de> serde::Deserialize<'de> for JSXChildItem {\n+ fn deserialize(deserializer: D) -> Result\n+ where\n+ D: serde::Deserializer<'de>,\n+ {\n+ let tagged = serde::Deserializer::deserialize_any(\n+ deserializer,\n+ serde::__private::de::TaggedContentVisitor::<\n+ __JSXChildItemTag,\n+ >::new(\"type\", \"Pattern\"),\n+ )?;\n+ match tagged.0 {\n+ __JSXChildItemTag::JSXText => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXChildItem::JSXText(node))\n+ }\n+ __JSXChildItemTag::JSXExpressionContainer => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXChildItem::JSXExpressionContainer(node))\n+ }\n+ __JSXChildItemTag::JSXSpreadChild => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXChildItem::JSXSpreadChild(node))\n+ }\n+ __JSXChildItemTag::JSXElement => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXChildItem::JSXElement(node))\n+ }\n+ __JSXChildItemTag::JSXFragment => {\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(JSXChildItem::JSXFragment(node))\n+ }\n }\n }\n }\ndiff --git a\/compiler\/forget\/crates\/estree\/src\/snapshots\/estree__tests__fixtures@test.json.snap b\/compiler\/forget\/crates\/estree\/src\/snapshots\/estree__tests__fixtures@test.json.snap\nindex d3b5edb7ef..e7a5e1a70e 100644\n--- a\/compiler\/forget\/crates\/estree\/src\/snapshots\/estree__tests__fixtures@test.json.snap\n+++ b\/compiler\/forget\/crates\/estree\/src\/snapshots\/estree__tests__fixtures@test.json.snap\n@@ -358,13 +358,11 @@ Input:\n \n Output:\n {\n- \"sourceType\": \"script\",\n \"body\": [\n {\n \"type\": \"FunctionDeclaration\",\n \"id\": {\n \"name\": \"foo\",\n- \"binding\": null,\n \"loc\": {\n \"source\": null,\n \"start\": {\n@@ -382,17 +380,13 @@ Output:\n }\n },\n \"params\": [],\n- \"generator\": false,\n- \"async\": false,\n \"body\": {\n- \"type\": \"BlockStatement\",\n \"body\": [\n {\n \"type\": \"ReturnStatement\",\n \"argument\": {\n \"type\": \"JSXElement\",\n \"openingElement\": {\n- \"type\": \"JSXOpeningElement\",\n \"name\": {\n \"type\": \"JSXMemberExpression\",\n \"object\": {\n@@ -415,7 +409,6 @@ Output:\n }\n },\n \"property\": {\n- \"type\": \"JSXIdentifier\",\n \"name\": \"Bar\",\n \"loc\": {\n \"source\": null,\n@@ -451,6 +444,7 @@ Output:\n },\n \"attributes\": [\n {\n+ \"type\": \"JSXAttribute\",\n \"name\": {\n \"type\": \"JSXIdentifier\",\n \"name\": \"a\",\n@@ -474,8 +468,11 @@ Output:\n \"type\": \"JSXExpressionContainer\",\n \"expression\": {\n \"type\": \"Literal\",\n- \"value\": 10,\n+ \"value\": {\n+ \"Number\": 10\n+ },\n \"raw\": \"10\",\n+ \"regex\": null,\n \"loc\": {\n \"source\": null,\n \"start\": {\n@@ -544,7 +541,6 @@ Output:\n },\n \"children\": [],\n \"closingElement\": {\n- \"type\": \"JSXClosingElement\",\n \"name\": {\n \"type\": \"JSXMemberExpression\",\n \"object\": {\n@@ -567,7 +563,6 @@ Output:\n }\n },\n \"property\": {\n- \"type\": \"JSXIdentifier\",\n \"name\": \"Bar\",\n \"loc\": {\n \"source\": null,\n@@ -666,6 +661,8 @@ Output:\n \"end\": 56\n }\n },\n+ \"generator\": false,\n+ \"async\": false,\n \"loc\": {\n \"source\": null,\n \"start\": {\n@@ -683,7 +680,7 @@ Output:\n }\n }\n ],\n- \"comments\": [],\n+ \"sourceType\": \"script\",\n \"loc\": {\n \"source\": null,\n \"start\": {\n","body":"","parents":["61d7e6ae3d81dbaa0c86950b3befbb108f14d4d4"],"files":[{"status":"M","path":"compiler\/forget\/crates\/estree-codegen\/src\/ecmascript.json"},{"status":"M","path":"compiler\/forget\/crates\/estree\/src\/generated.rs"},{"status":"M","path":"compiler\/forget\/crates\/estree\/src\/snapshots\/estree__tests__fixtures@test.json.snap"}]}

dillon1000/react

Files changed