Skip to content
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

Jump to bottom

Add support for FreeVarReference::Error #6177

Merged
merged 1 commit into from
Oct 15, 2023
Merged

Add support for FreeVarReference::Error #6177

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
1 change: 1 addition & 0 deletions crates/turbopack-core/src/compile_time_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ pub enum FreeVarReference {
export: Option<String>,
},
Value(CompileTimeDefineValue),
Error(String),
}

impl From<bool> for FreeVarReference {
Expand Down
1 change: 1 addition & 0 deletions crates/turbopack-ecmascript/src/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ pub mod failed_to_analyse {
pub const NODE_PROTOBUF_LOADER: &str = "TP1105";
pub const AMD_DEFINE: &str = "TP1200";
pub const NEW_URL_IMPORT_META: &str = "TP1201";
pub const FREE_VAR_REFERENCE: &str = "TP1202";
}
}
25 changes: 19 additions & 6 deletions crates/turbopack-ecmascript/src/references/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,22 +939,22 @@ pub(crate) async fn analyze_ecmascript_module(
Effect::FreeVar {
var,
ast_path,
span: _,
span,
in_try: _,
} => {
handle_free_var(&ast_path, var, &analysis_state, &mut analysis).await?;
handle_free_var(&ast_path, var, span, &analysis_state, &mut analysis).await?;
}
Effect::Member {
obj,
prop,
ast_path,
span: _,
span,
in_try,
} => {
let obj = analysis_state.link_value(obj, in_try).await?;
let prop = analysis_state.link_value(prop, in_try).await?;

handle_member(&ast_path, obj, prop, &analysis_state, &mut analysis).await?;
handle_member(&ast_path, obj, prop, span, &analysis_state, &mut analysis).await?;
}
Effect::ImportedBinding {
esm_reference_index,
Expand Down Expand Up @@ -1674,6 +1674,7 @@ async fn handle_member(
ast_path: &[AstParentKind],
obj: JsValue,
prop: JsValue,
span: Span,
state: &AnalysisState<'_>,
analysis: &mut AnalyzeEcmascriptModuleResultBuilder,
) -> Result<()> {
Expand All @@ -1690,7 +1691,7 @@ async fn handle_member(
continue;
}
if obj.iter_defineable_name_rev().eq(it)
&& handle_free_var_reference(ast_path, value, state, analysis).await?
&& handle_free_var_reference(ast_path, value, span, state, analysis).await?
{
return Ok(());
}
Expand All @@ -1717,6 +1718,7 @@ async fn handle_member(
async fn handle_free_var(
ast_path: &[AstParentKind],
var: JsValue,
span: Span,
state: &AnalysisState<'_>,
analysis: &mut AnalyzeEcmascriptModuleResultBuilder,
) -> Result<()> {
Expand All @@ -1727,10 +1729,11 @@ async fn handle_free_var(
if name.len() != def_name_len {
continue;
}

if var
.iter_defineable_name_rev()
.eq(name.iter().map(Cow::Borrowed).rev())
&& handle_free_var_reference(ast_path, value, state, analysis).await?
&& handle_free_var_reference(ast_path, value, span, state, analysis).await?
{
return Ok(());
}
Expand All @@ -1743,6 +1746,7 @@ async fn handle_free_var(
async fn handle_free_var_reference(
ast_path: &[AstParentKind],
value: &FreeVarReference,
span: Span,
state: &AnalysisState<'_>,
analysis: &mut AnalyzeEcmascriptModuleResultBuilder,
) -> Result<bool> {
Expand All @@ -1759,7 +1763,16 @@ async fn handle_free_var_reference(
) {
return Ok(false);
}

match value {
FreeVarReference::Error(error_message) => state.handler.span_err_with_code(
span,
error_message,
DiagnosticId::Error(
errors::failed_to_analyse::ecmascript::FREE_VAR_REFERENCE.to_string(),
),
),

FreeVarReference::Value(value) => {
analysis.add_code_gen(ConstantValue::new(
Value::new(value.clone()),
Expand Down
Loading