Skip to content

[rust-compiler] Preserve explicit predicate: null in function-like nodes #36517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
poteto wants to merge 1 commit into
base: pr-36173
Choose a base branch
from
Open

[rust-compiler] Preserve explicit predicate: null in function-like nodes #36517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion compiler/crates/react_compiler_ast/src/expressions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,8 @@ pub struct ArrowFunctionExpression {
#[serde(
default,
skip_serializing_if = "Option::is_none",
rename = "predicate"
rename = "predicate",
deserialize_with = "crate::common::nullable_value"
)]
pub predicate: Option<Box<serde_json::Value>>,
}
Expand Down Expand Up @@ -327,6 +328,13 @@ pub struct ObjectMethod {
rename = "typeParameters"
)]
pub type_parameters: Option<Box<serde_json::Value>>,
#[serde(
default,
skip_serializing_if = "Option::is_none",
rename = "predicate",
deserialize_with = "crate::common::nullable_value"
)]
pub predicate: Option<Box<serde_json::Value>>,
}

#[derive(Debug, Clone, Serialize, Deserialize)]
Expand Down
3 changes: 2 additions & 1 deletion compiler/crates/react_compiler_ast/src/statements.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,8 @@ pub struct FunctionDeclaration {
#[serde(
default,
skip_serializing_if = "Option::is_none",
rename = "predicate"
rename = "predicate",
deserialize_with = "crate::common::nullable_value"
)]
pub predicate: Option<Box<serde_json::Value>>,
/// Set by the Hermes parser for Flow `component Foo(...) { ... }` syntax
Expand Down
1 change: 1 addition & 0 deletions compiler/crates/react_compiler_oxc/src/convert_ast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1969,6 +1969,7 @@ impl<'a> ConvertCtx<'a> {
.type_parameters
.as_ref()
.map(|_| Box::new(serde_json::Value::Null)),
predicate: None,
});
}
}
Expand Down
1 change: 1 addition & 0 deletions compiler/crates/react_compiler_reactive_scopes/src/codegen_reactive_function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2745,6 +2745,7 @@ fn codegen_object_expression(
decorators: None,
return_type: None,
type_parameters: None,
predicate: None,
},
));
}
Expand Down
3 changes: 3 additions & 0 deletions compiler/crates/react_compiler_swc/src/convert_ast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1336,6 +1336,7 @@ impl<'a> ConvertCtx<'a> {
.as_ref()
.map(|_| Box::new(serde_json::Value::Null)),
type_parameters: None,
predicate: None,
}),
swc::Prop::Setter(s) => ObjectExpressionProperty::ObjectMethod(ObjectMethod {
base: self.make_base_node(s.span),
Expand All @@ -1359,6 +1360,7 @@ impl<'a> ConvertCtx<'a> {
decorators: None,
return_type: None,
type_parameters: None,
predicate: None,
}),
swc::Prop::Method(m) => ObjectExpressionProperty::ObjectMethod(ObjectMethod {
base: self.make_base_node(m.span()),
Expand Down Expand Up @@ -1391,6 +1393,7 @@ impl<'a> ConvertCtx<'a> {
.type_params
.as_ref()
.map(|_| Box::new(serde_json::Value::Null)),
predicate: None,
}),
swc::Prop::Assign(a) => {
let ident = self.convert_ident_to_identifier(&a.key);
Expand Down
Loading