{"files":[{"path":"compiler\/forget\/crates\/build-hir\/src\/build.rs","status":"M"},{"path":"compiler\/forget\/crates\/build-hir\/src\/error.rs","status":"M"},{"path":"compiler\/forget\/crates\/estree-codegen\/src\/ecmascript.json","status":"M"},{"path":"compiler\/forget\/crates\/estree-swc\/src\/lib.rs","status":"M"},{"path":"compiler\/forget\/crates\/estree\/src\/binding.rs","status":"M"},{"path":"compiler\/forget\/crates\/estree\/src\/generated.rs","status":"M"},{"path":"compiler\/forget\/crates\/estree\/src\/lib.rs","status":"M"},{"path":"compiler\/forget\/crates\/estree\/src\/snapshots\/estree__tests__fixtures@simple.json.snap","status":"M"},{"path":"compiler\/forget\/crates\/fixtures\/tests\/fixtures_test.rs","status":"M"},{"path":"compiler\/forget\/crates\/hir\/src\/instruction.rs","status":"M"},{"path":"compiler\/forget\/crates\/hir\/src\/print.rs","status":"M"}],"body":"The previous PRs to make `estree` use codegen broke the swc->estree and \nestree->hir conversions. This PR updates those conversions so everything builds \nnow.","patch":"diff --git a\/compiler\/forget\/crates\/build-hir\/src\/build.rs b\/compiler\/forget\/crates\/build-hir\/src\/build.rs\nindex a4241d7ee2..10150c543f 100644\n--- a\/compiler\/forget\/crates\/build-hir\/src\/build.rs\n+++ b\/compiler\/forget\/crates\/build-hir\/src\/build.rs\n@@ -1,7 +1,8 @@\n use bumpalo::collections::{String, Vec};\n use estree::{\n- AssignmentTarget, BinaryExpression, ExpressionLike, ForInit, ForStatement, FunctionDeclaration,\n- IfStatement, Literal, LiteralValue, Pattern, Statement, VariableDeclarationKind,\n+ AssignmentTarget, BinaryExpression, BlockStatement, Expression, ForInit, ForStatement,\n+ FunctionDeclaration, IfStatement, JsValue, Literal, Pattern, Statement,\n+ VariableDeclarationKind,\n };\n use hir::{\n ArrayElement, BlockKind, BranchTerminal, Environment, ForTerminal, Function, GotoKind,\n@@ -27,7 +28,21 @@ pub fn build<'a>(\n ) -> Result, BuildDiagnostic> {\n let mut builder = Builder::new(environment);\n \n- lower_statement(environment, &mut builder, fun.body.unwrap(), None)?;\n+ match fun.function.body {\n+ Some(estree::FunctionBody::BlockStatement(body)) => {\n+ lower_block_statement(environment, &mut builder, *body, None)?\n+ }\n+ Some(estree::FunctionBody::Expression(body)) => {\n+ lower_expression_to_temporary(environment, &mut builder, body)?;\n+ }\n+ None => {\n+ return Err(BuildDiagnostic::new(\n+ DiagnosticError::EmptyFunction,\n+ ErrorSeverity::InvalidSyntax,\n+ fun.range,\n+ ));\n+ }\n+ }\n \n \/\/ In case the function did not explicitly return, terminate the final\n \/\/ block with an explicit `return undefined`. If the function *did* return,\n@@ -49,11 +64,23 @@ pub fn build<'a>(\n let body = builder.build()?;\n Ok(Function {\n body,\n- is_async: fun.is_async,\n- is_generator: fun.is_generator,\n+ is_async: fun.function.is_async,\n+ is_generator: fun.function.is_generator,\n })\n }\n \n+fn lower_block_statement<'a>(\n+ env: &'a Environment<'a>,\n+ builder: &mut Builder<'a>,\n+ stmt: BlockStatement,\n+ label: Option>,\n+) -> Result<(), BuildDiagnostic> {\n+ for stmt in stmt.body {\n+ lower_statement(env, builder, stmt, None)?;\n+ }\n+ Ok(())\n+}\n+\n \/\/\/ Convert a statement to HIR. This will often result in multiple instructions and blocks\n \/\/\/ being created as statements often describe control flow.\n fn lower_statement<'a>(\n@@ -64,9 +91,7 @@ fn lower_statement<'a>(\n ) -> Result<(), BuildDiagnostic> {\n match stmt {\n Statement::BlockStatement(stmt) => {\n- for stmt in stmt.body {\n- lower_statement(env, builder, stmt, None)?;\n- }\n+ lower_block_statement(env, builder, *stmt, label)?;\n }\n Statement::BreakStatement(stmt) => {\n let block = builder.resolve_break(stmt.label.as_ref())?;\n@@ -292,7 +317,7 @@ fn lower_statement<'a>(\n fn lower_expression_to_temporary<'a>(\n env: &'a Environment<'a>,\n builder: &mut Builder<'a>,\n- expr: ExpressionLike,\n+ expr: Expression,\n ) -> Result, BuildDiagnostic> {\n let value = lower_expression(env, builder, expr)?;\n Ok(lower_value_to_temporary(env, builder, value))\n@@ -305,10 +330,10 @@ fn lower_expression_to_temporary<'a>(\n fn lower_expression<'a>(\n env: &'a Environment<'a>,\n builder: &mut Builder<'a>,\n- expr: ExpressionLike,\n+ expr: Expression,\n ) -> Result, BuildDiagnostic> {\n Ok(match expr {\n- ExpressionLike::Identifier(expr) => {\n+ Expression::Identifier(expr) => {\n \/\/ TODO: handle unbound variables\n let binding = builder.resolve_binding(&expr)?;\n match binding {\n@@ -324,24 +349,31 @@ fn lower_expression<'a>(\n }),\n }\n }\n- ExpressionLike::Literal(expr) => InstructionValue::Primitive(hir::Primitive {\n+ Expression::Literal(expr) => InstructionValue::Primitive(hir::Primitive {\n value: lower_primitive(env, builder, *expr),\n }),\n- ExpressionLike::ArrayExpression(expr) => {\n+ Expression::ArrayExpression(expr) => {\n let mut elements = Vec::with_capacity_in(expr.elements.len(), &env.allocator);\n for expr in expr.elements {\n let element = match expr {\n- ExpressionLike::SpreadElement(expr) => ArrayElement::Spread(\n- lower_expression_to_temporary(env, builder, expr.argument)?,\n+ Some(estree::ExpressionOrSpread::SpreadElement(expr)) => {\n+ Some(ArrayElement::Spread(lower_expression_to_temporary(\n+ env,\n+ builder,\n+ expr.argument,\n+ )?))\n+ }\n+ Some(estree::ExpressionOrSpread::Expression(expr)) => Some(\n+ ArrayElement::Place(lower_expression_to_temporary(env, builder, expr)?),\n ),\n- _ => ArrayElement::Place(lower_expression_to_temporary(env, builder, expr)?),\n+ None => None,\n };\n elements.push(element);\n }\n InstructionValue::Array(hir::Array { elements })\n }\n \n- ExpressionLike::AssignmentExpression(expr) => match expr.operator {\n+ Expression::AssignmentExpression(expr) => match expr.operator {\n estree::AssignmentOperator::Equals => {\n let right = lower_expression_to_temporary(env, builder, expr.right)?;\n lower_assignment(env, builder, InstructionKind::Reassign, expr.left, right)?\n@@ -349,7 +381,7 @@ fn lower_expression<'a>(\n _ => todo!(\"lower assignment expr {:#?}\", expr),\n },\n \n- ExpressionLike::BinaryExpression(expr) => {\n+ Expression::BinaryExpression(expr) => {\n let BinaryExpression {\n left,\n operator,\n@@ -365,15 +397,6 @@ fn lower_expression<'a>(\n })\n }\n \n- \/\/ Cases that cannot appear in expression position but which are included in ExpressionLike\n- \/\/ to make serialization easier\n- ExpressionLike::SpreadElement(expr) => {\n- return Err(BuildDiagnostic::new(\n- DiagnosticError::NonExpressionInExpressionPosition,\n- ErrorSeverity::Invariant,\n- expr.range,\n- ));\n- }\n _ => todo!(\"Lower expr {expr:#?}\"),\n })\n }\n@@ -386,7 +409,7 @@ fn lower_assignment<'a>(\n value: Place<'a>,\n ) -> Result, BuildDiagnostic> {\n Ok(match lvalue {\n- AssignmentTarget::Pattern(lvalue) => match *lvalue {\n+ AssignmentTarget::Pattern(lvalue) => match lvalue {\n Pattern::Identifier(lvalue) => {\n let place = lower_identifier_for_assignment(env, builder, kind, *lvalue)?;\n let temporary = lower_value_to_temporary(\n@@ -466,10 +489,10 @@ fn lower_primitive<'a>(\n literal: Literal,\n ) -> PrimitiveValue<'a> {\n match literal.value {\n- LiteralValue::Boolean(bool) => PrimitiveValue::Boolean(bool),\n- LiteralValue::Null => PrimitiveValue::Null,\n- LiteralValue::Number(value) => PrimitiveValue::Number(f64::from(value).into()),\n- LiteralValue::String(s) => PrimitiveValue::String(String::from_str_in(&s, &env.allocator)),\n+ JsValue::Bool(bool) => PrimitiveValue::Boolean(bool),\n+ JsValue::Null => PrimitiveValue::Null,\n+ JsValue::Number(value) => PrimitiveValue::Number(f64::from(value).into()),\n+ JsValue::String(s) => PrimitiveValue::String(String::from_str_in(&s, &env.allocator)),\n _ => todo!(\"Lower literal {literal:#?}\"),\n }\n }\ndiff --git a\/compiler\/forget\/crates\/build-hir\/src\/error.rs b\/compiler\/forget\/crates\/build-hir\/src\/error.rs\nindex 7bd64ef61c..4a784ebc0d 100644\n--- a\/compiler\/forget\/crates\/build-hir\/src\/error.rs\n+++ b\/compiler\/forget\/crates\/build-hir\/src\/error.rs\n@@ -76,6 +76,10 @@ pub enum DiagnosticError {\n \/\/\/ ErrorSeverity::Invariant\n #[error(\"Invariant: Identifier was not resolved (did name resolution run successfully?)\")]\n UnknownIdentifier,\n+\n+ \/\/\/ ErrorSeverity::InvalidSyntax\n+ #[error(\"Expected function to have a body\")]\n+ EmptyFunction,\n }\n \n #[derive(Error, Diagnostic, Debug)]\ndiff --git a\/compiler\/forget\/crates\/estree-codegen\/src\/ecmascript.json b\/compiler\/forget\/crates\/estree-codegen\/src\/ecmascript.json\nindex ea8d5284e2..d3384b67ac 100644\n--- a\/compiler\/forget\/crates\/estree-codegen\/src\/ecmascript.json\n+++ b\/compiler\/forget\/crates\/estree-codegen\/src\/ecmascript.json\n@@ -91,7 +91,8 @@\n \"type\": \"Vec\"\n },\n \"source_type\": {\n- \"type\": \"Option\",\n+ \"type\": \"SourceType\",\n+ \"optional\": true,\n \"rename\": \"sourceType\"\n }\n }\ndiff --git a\/compiler\/forget\/crates\/estree-swc\/src\/lib.rs b\/compiler\/forget\/crates\/estree-swc\/src\/lib.rs\nindex 4cb6adc517..d6e4221a29 100644\n--- a\/compiler\/forget\/crates\/estree-swc\/src\/lib.rs\n+++ b\/compiler\/forget\/crates\/estree-swc\/src\/lib.rs\n@@ -71,9 +71,7 @@ fn convert_program(cx: &Context, program: &Program) -> estree::Program {\n let body = &program.body;\n program_items = Vec::with_capacity(body.len());\n for item in body {\n- program_items.push(estree::ModuleItem::Statement(Box::new(convert_statement(\n- cx, item,\n- ))));\n+ program_items.push(estree::ModuleItem::Statement(convert_statement(cx, item)));\n }\n }\n };\n@@ -84,7 +82,7 @@ fn convert_program(cx: &Context, program: &Program) -> estree::Program {\n estree::SourceType::Module\n },\n body: program_items,\n- comments: None,\n+ \/\/ comments: None,\n loc: None,\n range: None,\n }\n@@ -92,9 +90,7 @@ fn convert_program(cx: &Context, program: &Program) -> estree::Program {\n \n fn convert_module_item(cx: &Context, item: &ModuleItem) -> estree::ModuleItem {\n match item {\n- ModuleItem::Stmt(item) => {\n- estree::ModuleItem::Statement(Box::new(convert_statement(cx, item)))\n- }\n+ ModuleItem::Stmt(item) => estree::ModuleItem::Statement(convert_statement(cx, item)),\n _ => todo!(\"translate module item {:#?}\", item),\n }\n }\n@@ -131,23 +127,27 @@ fn convert_statement(cx: &Context, stmt: &Stmt) -> estree::Statement {\n Stmt::Decl(Decl::Fn(item)) => {\n let name = item.ident.sym.to_string();\n estree::Statement::FunctionDeclaration(Box::new(estree::FunctionDeclaration {\n- id: Some(estree::Identifier {\n- name,\n- binding: convert_binding(cx, item.ident.span.ctxt),\n- loc: None,\n- range: convert_span(&item.ident.span),\n- }),\n- params: item\n- .function\n- .params\n- .iter()\n- .map(|param| convert_pattern(cx, ¶m.pat))\n- .collect(),\n- body: item.function.body.as_ref().map(|body| {\n- estree::Statement::BlockStatement(Box::new(convert_block_statement(cx, body)))\n- }),\n- is_async: item.function.is_async,\n- is_generator: item.function.is_generator,\n+ function: estree::Function {\n+ id: Some(estree::Identifier {\n+ name,\n+ binding: convert_binding(cx, item.ident.span.ctxt),\n+ loc: None,\n+ range: convert_span(&item.ident.span),\n+ }),\n+ params: item\n+ .function\n+ .params\n+ .iter()\n+ .map(|param| convert_pattern(cx, ¶m.pat))\n+ .collect(),\n+ body: item.function.body.as_ref().map(|body| {\n+ estree::FunctionBody::BlockStatement(Box::new(convert_block_statement(\n+ cx, body,\n+ )))\n+ }),\n+ is_async: item.function.is_async,\n+ is_generator: item.function.is_generator,\n+ },\n loc: None,\n range: convert_span(&item.function.span),\n }))\n@@ -206,7 +206,7 @@ fn convert_statement(cx: &Context, stmt: &Stmt) -> estree::Statement {\n Stmt::For(item) => estree::Statement::ForStatement(Box::new(estree::ForStatement {\n init: item.init.as_ref().map(|init| match init {\n VarDeclOrExpr::Expr(init) => {\n- estree::ForInit::Expression(Box::new(convert_expression(cx, init)))\n+ estree::ForInit::Expression(convert_expression(cx, init))\n }\n VarDeclOrExpr::VarDecl(init) => {\n assert_eq!(init.decls.len(), 1);\n@@ -268,28 +268,28 @@ fn convert_variable_declaration(cx: &Context, decl: &VarDecl) -> estree::Variabl\n }\n }\n \n-fn convert_expression(cx: &Context, expr: &Expr) -> estree::ExpressionLike {\n+fn convert_expression(cx: &Context, expr: &Expr) -> estree::Expression {\n match expr {\n- Expr::Ident(expr) => {\n- estree::ExpressionLike::Identifier(Box::new(convert_identifier(cx, expr)))\n- }\n+ Expr::Ident(expr) => estree::Expression::Identifier(Box::new(convert_identifier(cx, expr))),\n Expr::Array(expr) => {\n- estree::ExpressionLike::ArrayExpression(Box::new(estree::ArrayExpression {\n+ estree::Expression::ArrayExpression(Box::new(estree::ArrayExpression {\n elements: expr\n .elems\n .iter()\n .map(|item| {\n \/\/ TODO: represent holes in array expressions\n- let value = item.as_ref().unwrap();\n+ let value = item.as_ref()?;\n match value.spread {\n- Some(spread) => estree::ExpressionLike::SpreadElement(Box::new(\n- estree::SpreadElement {\n+ Some(spread) => Some(estree::ExpressionOrSpread::SpreadElement(\n+ Box::new(estree::SpreadElement {\n argument: convert_expression(cx, &value.expr),\n loc: None,\n range: convert_span(&spread),\n- },\n+ }),\n+ )),\n+ None => Some(estree::ExpressionOrSpread::Expression(\n+ convert_expression(cx, &value.expr),\n )),\n- None => convert_expression(cx, &value.expr),\n }\n })\n .collect(),\n@@ -297,17 +297,18 @@ fn convert_expression(cx: &Context, expr: &Expr) -> estree::ExpressionLike {\n range: convert_span(&expr.span),\n }))\n }\n- Expr::Await(expr) => {\n- estree::ExpressionLike::AwaitExpression(Box::new(estree::AwaitExpression {\n- argument: convert_expression(cx, &expr.arg),\n- loc: None,\n- range: convert_span(&expr.span),\n- }))\n+ Expr::Await(_expr) => {\n+ \/\/ estree::Expression::AwaitExpression(Box::new(estree::AwaitExpression {\n+ \/\/ argument: convert_expression(cx, &expr.arg),\n+ \/\/ loc: None,\n+ \/\/ range: convert_span(&expr.span),\n+ \/\/ }))\n+ todo!(\"await expression\")\n }\n Expr::Unary(expr) => {\n- estree::ExpressionLike::UnaryExpression(Box::new(estree::UnaryExpression {\n+ estree::Expression::UnaryExpression(Box::new(estree::UnaryExpression {\n operator: convert_unary_operator(expr.op),\n- is_prefix: false,\n+ prefix: false,\n argument: convert_expression(cx, &expr.arg),\n loc: None,\n range: convert_span(&expr.span),\n@@ -315,7 +316,7 @@ fn convert_expression(cx: &Context, expr: &Expr) -> estree::ExpressionLike {\n }\n Expr::Bin(expr) => match convert_binary_operator(expr.op) {\n Operator::Binary(op) => {\n- estree::ExpressionLike::BinaryExpression(Box::new(estree::BinaryExpression {\n+ estree::Expression::BinaryExpression(Box::new(estree::BinaryExpression {\n operator: op,\n left: convert_expression(cx, &expr.left),\n right: convert_expression(cx, &expr.right),\n@@ -324,7 +325,7 @@ fn convert_expression(cx: &Context, expr: &Expr) -> estree::ExpressionLike {\n }))\n }\n Operator::Logical(op) => {\n- estree::ExpressionLike::LogicalExpression(Box::new(estree::LogicalExpression {\n+ estree::Expression::LogicalExpression(Box::new(estree::LogicalExpression {\n operator: op,\n left: convert_expression(cx, &expr.left),\n right: convert_expression(cx, &expr.right),\n@@ -335,30 +336,28 @@ fn convert_expression(cx: &Context, expr: &Expr) -> estree::ExpressionLike {\n },\n Expr::Lit(expr) => {\n let (value, range) = match expr {\n- Lit::Bool(expr) => (\n- estree::LiteralValue::Boolean(expr.value),\n- convert_span(&expr.span),\n- ),\n+ Lit::Bool(expr) => (estree::JsValue::Bool(expr.value), convert_span(&expr.span)),\n Lit::Num(expr) => (\n- estree::LiteralValue::Number(expr.value.into()),\n+ estree::JsValue::Number(expr.value.into()),\n convert_span(&expr.span),\n ),\n Lit::Str(expr) => (\n- estree::LiteralValue::String(expr.value.to_string()),\n+ estree::JsValue::String(expr.value.to_string()),\n convert_span(&expr.span),\n ),\n- Lit::Null(expr) => (estree::LiteralValue::Null, convert_span(&expr.span)),\n+ Lit::Null(expr) => (estree::JsValue::Null, convert_span(&expr.span)),\n _ => todo!(),\n };\n- estree::ExpressionLike::Literal(Box::new(estree::Literal {\n+ estree::Expression::Literal(Box::new(estree::Literal {\n value,\n raw: None,\n loc: None,\n+ regex: None,\n range,\n }))\n }\n Expr::Assign(expr) => {\n- estree::ExpressionLike::AssignmentExpression(Box::new(estree::AssignmentExpression {\n+ estree::Expression::AssignmentExpression(Box::new(estree::AssignmentExpression {\n operator: convert_assignment_operator(expr.op),\n left: convert_assignment_target(cx, &expr.left),\n right: convert_expression(cx, &expr.right),\n@@ -367,7 +366,7 @@ fn convert_expression(cx: &Context, expr: &Expr) -> estree::ExpressionLike {\n }))\n }\n Expr::Member(expr) => {\n- estree::ExpressionLike::MemberExpression(Box::new(convert_member_expression(cx, expr)))\n+ estree::Expression::MemberExpression(Box::new(convert_member_expression(cx, expr)))\n }\n _ => todo!(\"translate expression {:#?}\", expr),\n }\n@@ -375,17 +374,17 @@ fn convert_expression(cx: &Context, expr: &Expr) -> estree::ExpressionLike {\n \n fn convert_assignment_target(cx: &Context, target: &PatOrExpr) -> estree::AssignmentTarget {\n match target {\n- PatOrExpr::Pat(target) => {\n- estree::AssignmentTarget::Pattern(Box::new(convert_pattern(cx, target)))\n- }\n+ PatOrExpr::Pat(target) => estree::AssignmentTarget::Pattern(convert_pattern(cx, target)),\n PatOrExpr::Expr(target) => {\n match target.as_ref() {\n- Expr::Member(target) => estree::AssignmentTarget::MemberExpression(Box::new(\n- convert_member_expression(cx, target),\n- )),\n- Expr::Ident(target) => estree::AssignmentTarget::Pattern(Box::new(\n+ Expr::Member(target) => {\n+ estree::AssignmentTarget::Expression(estree::Expression::MemberExpression(\n+ Box::new(convert_member_expression(cx, target)),\n+ ))\n+ }\n+ Expr::Ident(target) => estree::AssignmentTarget::Pattern(\n estree::Pattern::Identifier(Box::new(convert_identifier(cx, target))),\n- )),\n+ ),\n _ => {\n panic!(\"Expected assignment target to be member expression or identifier, got {:#?}\", target)\n }\n@@ -398,7 +397,7 @@ fn convert_member_expression(cx: &Context, expr: &MemberExpr) -> estree::MemberE\n let (is_computed, property) = match &expr.prop {\n MemberProp::Ident(prop) => (\n false,\n- estree::ExpressionLike::Identifier(Box::new(convert_identifier(cx, prop))),\n+ estree::Expression::Identifier(Box::new(convert_identifier(cx, prop))),\n ),\n MemberProp::Computed(prop) => (true, convert_expression(cx, &prop.expr)),\n _ => {\n@@ -406,10 +405,10 @@ fn convert_member_expression(cx: &Context, expr: &MemberExpr) -> estree::MemberE\n }\n };\n estree::MemberExpression {\n- object: convert_expression(cx, &expr.obj),\n+ object: estree::ExpressionOrSuper::Expression(convert_expression(cx, &expr.obj)),\n property,\n- is_computed,\n- is_optional: false,\n+ computed: false, \/\/ TODO\n+ \/\/ optional: false, \/\/ TODO\n loc: None,\n range: convert_span(&expr.span),\n }\n@@ -417,7 +416,7 @@ fn convert_member_expression(cx: &Context, expr: &MemberExpr) -> estree::MemberE\n \n fn convert_unary_operator(op: UnaryOp) -> estree::UnaryOperator {\n match op {\n- UnaryOp::Bang => estree::UnaryOperator::Exclamation,\n+ UnaryOp::Bang => estree::UnaryOperator::Negation,\n UnaryOp::Delete => estree::UnaryOperator::Delete,\n UnaryOp::Minus => estree::UnaryOperator::Minus,\n UnaryOp::Plus => estree::UnaryOperator::Plus,\n@@ -442,32 +441,34 @@ enum Operator {\n \n fn convert_binary_operator(op: BinaryOp) -> Operator {\n match op {\n- BinaryOp::Add => Operator::Binary(estree::BinaryOperator::Plus),\n- BinaryOp::BitAnd => Operator::Binary(estree::BinaryOperator::Ampersand),\n- BinaryOp::BitOr => Operator::Binary(estree::BinaryOperator::Pipe),\n- BinaryOp::BitXor => Operator::Binary(estree::BinaryOperator::Caret),\n- BinaryOp::Div => Operator::Binary(estree::BinaryOperator::Slash),\n- BinaryOp::EqEq => Operator::Binary(estree::BinaryOperator::EqualsEquals),\n- BinaryOp::EqEqEq => Operator::Binary(estree::BinaryOperator::TripleEquals),\n- BinaryOp::Exp => Operator::Binary(estree::BinaryOperator::AsteriskAsterisk),\n+ BinaryOp::Add => Operator::Binary(estree::BinaryOperator::Add),\n+ BinaryOp::BitAnd => Operator::Binary(estree::BinaryOperator::BinaryAnd),\n+ BinaryOp::BitOr => Operator::Binary(estree::BinaryOperator::BinaryOr),\n+ BinaryOp::BitXor => Operator::Binary(estree::BinaryOperator::BinaryXor),\n+ BinaryOp::Div => Operator::Binary(estree::BinaryOperator::Divide),\n+ BinaryOp::EqEq => Operator::Binary(estree::BinaryOperator::Equals),\n+ BinaryOp::EqEqEq => Operator::Binary(estree::BinaryOperator::StrictEquals),\n+ \/\/ BinaryOp::Exp => Operator::Binary(estree::BinaryOperator::AsteriskAsterisk),\n BinaryOp::Gt => Operator::Binary(estree::BinaryOperator::GreaterThan),\n- BinaryOp::GtEq => Operator::Binary(estree::BinaryOperator::GreaterThanEquals),\n+ BinaryOp::GtEq => Operator::Binary(estree::BinaryOperator::GreaterThanOrEqual),\n BinaryOp::In => Operator::Binary(estree::BinaryOperator::In),\n BinaryOp::InstanceOf => Operator::Binary(estree::BinaryOperator::Instanceof),\n- BinaryOp::LShift => Operator::Binary(estree::BinaryOperator::LtLt),\n+ BinaryOp::LShift => Operator::Binary(estree::BinaryOperator::ShiftLeft),\n BinaryOp::Lt => Operator::Binary(estree::BinaryOperator::LessThan),\n- BinaryOp::LtEq => Operator::Binary(estree::BinaryOperator::LessThanEquals),\n- BinaryOp::Mod => Operator::Binary(estree::BinaryOperator::Percent),\n- BinaryOp::Mul => Operator::Binary(estree::BinaryOperator::Asterisk),\n+ BinaryOp::LtEq => Operator::Binary(estree::BinaryOperator::LessThanOrEqual),\n+ BinaryOp::Mod => Operator::Binary(estree::BinaryOperator::Modulo),\n+ \/\/ BinaryOp::Mul => Operator::Binary(estree::BinaryOperator::Asterisk),\n BinaryOp::NotEq => Operator::Binary(estree::BinaryOperator::NotEquals),\n- BinaryOp::NotEqEq => Operator::Binary(estree::BinaryOperator::NotTripleEquals),\n- BinaryOp::RShift => Operator::Binary(estree::BinaryOperator::GtGt),\n- BinaryOp::Sub => Operator::Binary(estree::BinaryOperator::Minus),\n- BinaryOp::ZeroFillRShift => Operator::Binary(estree::BinaryOperator::GtGtGt),\n+ BinaryOp::NotEqEq => Operator::Binary(estree::BinaryOperator::NotStrictEquals),\n+ BinaryOp::RShift => Operator::Binary(estree::BinaryOperator::ShiftRight),\n+ BinaryOp::Sub => Operator::Binary(estree::BinaryOperator::Subtract),\n+ BinaryOp::ZeroFillRShift => Operator::Binary(estree::BinaryOperator::UnsignedShiftRight),\n+\n+ BinaryOp::LogicalAnd => Operator::Logical(estree::LogicalOperator::And),\n+ BinaryOp::LogicalOr => Operator::Logical(estree::LogicalOperator::Or),\n+ BinaryOp::NullishCoalescing => Operator::Logical(estree::LogicalOperator::NullCoalescing),\n \n- BinaryOp::LogicalAnd => Operator::Logical(estree::LogicalOperator::AmpersandAmpersand),\n- BinaryOp::LogicalOr => Operator::Logical(estree::LogicalOperator::PipePipe),\n- BinaryOp::NullishCoalescing => Operator::Logical(estree::LogicalOperator::QuestionQuestion),\n+ _ => panic!(\"Unsupported binary operator `{}`\", op),\n }\n }\n \n@@ -484,7 +485,7 @@ fn convert_pattern(cx: &Context, pat: &Pat) -> estree::Pattern {\n }\n \n fn convert_binding(context: &Context, binding_cx: SyntaxContext) -> Option {\n- let id = BindingId::new(NonZeroU32::new(binding_cx.as_u32()).unwrap());\n+ let id = BindingId::new(binding_cx.as_u32());\n if binding_cx.as_u32() == context.top_level_mark.as_u32() {\n Some(Binding::Global)\n } else if binding_cx.as_u32() == context.unresolved_mark.as_u32() {\ndiff --git a\/compiler\/forget\/crates\/estree\/src\/binding.rs b\/compiler\/forget\/crates\/estree\/src\/binding.rs\nindex a5fa32814c..4882bb97f6 100644\n--- a\/compiler\/forget\/crates\/estree\/src\/binding.rs\n+++ b\/compiler\/forget\/crates\/estree\/src\/binding.rs\n@@ -1,4 +1,23 @@\n use serde::{Deserialize, Serialize};\n \n-#[derive(Serialize, Deserialize, Clone, Debug)]\n-pub struct Binding;\n+#[derive(Serialize, Deserialize, Copy, Clone, Debug, PartialEq, Eq, Hash)]\n+pub enum Binding {\n+ Global,\n+ Module(BindingId),\n+ Local(BindingId),\n+}\n+\n+#[derive(Serialize, Deserialize, Copy, Clone, Debug, PartialEq, Eq, Hash)]\n+pub struct BindingId(u32);\n+\n+impl BindingId {\n+ pub fn new(value: u32) -> Self {\n+ Self(value)\n+ }\n+}\n+\n+impl From for u32 {\n+ fn from(value: BindingId) -> Self {\n+ value.0\n+ }\n+}\ndiff --git a\/compiler\/forget\/crates\/estree\/src\/generated.rs b\/compiler\/forget\/crates\/estree\/src\/generated.rs\nindex eb74c114f8..3f269fc132 100644\n--- a\/compiler\/forget\/crates\/estree\/src\/generated.rs\n+++ b\/compiler\/forget\/crates\/estree\/src\/generated.rs\n@@ -56,7 +56,8 @@ pub struct Literal {\n pub struct Program {\n pub body: Vec,\n #[serde(rename = \"sourceType\")]\n- pub source_type: Option,\n+ #[serde(default)]\n+ pub source_type: SourceType,\n #[serde(default)]\n pub loc: Option,\n #[serde(default)]\ndiff --git a\/compiler\/forget\/crates\/estree\/src\/lib.rs b\/compiler\/forget\/crates\/estree\/src\/lib.rs\nindex 202fb72755..4f5319f910 100644\n--- a\/compiler\/forget\/crates\/estree\/src\/lib.rs\n+++ b\/compiler\/forget\/crates\/estree\/src\/lib.rs\n@@ -4,7 +4,7 @@ mod generated_extensions;\n mod js_value;\n mod range;\n \n-pub use binding::Binding;\n+pub use binding::{Binding, BindingId};\n pub use generated::*;\n pub use js_value::JsValue;\n pub use range::SourceRange;\ndiff --git a\/compiler\/forget\/crates\/estree\/src\/snapshots\/estree__tests__fixtures@simple.json.snap b\/compiler\/forget\/crates\/estree\/src\/snapshots\/estree__tests__fixtures@simple.json.snap\nindex 85cb9a74bb..013848ff28 100644\n--- a\/compiler\/forget\/crates\/estree\/src\/snapshots\/estree__tests__fixtures@simple.json.snap\n+++ b\/compiler\/forget\/crates\/estree\/src\/snapshots\/estree__tests__fixtures@simple.json.snap\n@@ -351,7 +351,7 @@ Output:\n }\n }\n ],\n- \"sourceType\": null,\n+ \"sourceType\": \"script\",\n \"loc\": {\n \"source\": null,\n \"start\": {\ndiff --git a\/compiler\/forget\/crates\/fixtures\/tests\/fixtures_test.rs b\/compiler\/forget\/crates\/fixtures\/tests\/fixtures_test.rs\nindex 2b532a66e0..94a0f6ac38 100644\n--- a\/compiler\/forget\/crates\/fixtures\/tests\/fixtures_test.rs\n+++ b\/compiler\/forget\/crates\/fixtures\/tests\/fixtures_test.rs\n@@ -18,7 +18,7 @@ fn fixtures() {\n \n for (ix, item) in ast.body.into_iter().enumerate() {\n if let ModuleItem::Statement(stmt) = item {\n- if let Statement::FunctionDeclaration(fun) = *stmt {\n+ if let Statement::FunctionDeclaration(fun) = stmt {\n let allocator = Bump::new();\n let environment = allocator.alloc(Environment::new(\n &allocator,\ndiff --git a\/compiler\/forget\/crates\/hir\/src\/instruction.rs b\/compiler\/forget\/crates\/hir\/src\/instruction.rs\nindex 75dddb5ea6..7c60607bd8 100644\n--- a\/compiler\/forget\/crates\/hir\/src\/instruction.rs\n+++ b\/compiler\/forget\/crates\/hir\/src\/instruction.rs\n@@ -51,7 +51,7 @@ pub enum InstructionValue<'a> {\n \n #[derive(Debug)]\n pub struct Array<'a> {\n- pub elements: Vec<'a, ArrayElement<'a>>,\n+ pub elements: Vec<'a, Option>>,\n }\n \n #[derive(Debug)]\ndiff --git a\/compiler\/forget\/crates\/hir\/src\/print.rs b\/compiler\/forget\/crates\/hir\/src\/print.rs\nindex 3bd83493fa..8b1086c104 100644\n--- a\/compiler\/forget\/crates\/hir\/src\/print.rs\n+++ b\/compiler\/forget\/crates\/hir\/src\/print.rs\n@@ -55,7 +55,11 @@ impl<'a> Print for InstructionValue<'a> {\n if ix != 0 {\n write!(out, \", \")?;\n }\n- item.print(out)?;\n+ if let Some(item) = item {\n+ item.print(out)?;\n+ } else {\n+ write!(out, \"\")?;\n+ }\n }\n write!(out, \"]\")?;\n }\n","commit":{"authorName":"Joe Savona","shortRevision":"bdd50d522d","authoredAt":"2023-07-11T11:52:32+09:00","subject":"[rust] Update swc->estree->hir conversion for new estree","revision":"bdd50d522dd44e976dadbfe890856a46633b400b","authorEmail":"joesavona@fb.com"},"parents":["17ed6cc9a9de2bc6993c58d8e66c3de3e23ea16d"]}

dillon1000/react

Files changed