FreeVarReference::ReportUsage

Author: mischnic

turbopack/crates/turbopack-core/src/compile_time_info.rs

@@ -7,7 +7,7 @@ use turbo_rcstr::RcStr;
 use turbo_tasks::{FxIndexMap, NonLocalValue, ResolvedVc, Vc, trace::TraceRawVcs};
 use turbo_tasks_fs::FileSystemPath;
 
-use crate::environment::Environment;
+use crate::{environment::Environment, issue::IssueSeverity};
 
 #[macro_export]
 macro_rules! definable_name_map_pattern_internal {
@@ -313,12 +313,12 @@ pub enum FreeVarReference {
     Member(RcStr, RcStr),
     Value(CompileTimeDefineValue),
     InputRelative(InputRelativeConstant),
-    Error(RcStr),
-    /// Emits a warning when the free variable is inlined, then processes the inner reference.
-    /// Unlike `Error`, this will still perform the replacement after emitting the warning.
-    Warning {
+    // Report the replacement of this free var with the given severity and message, and
+    // potentially replace with the `inner` value.
+    ReportUsage {
         message: RcStr,
-        inner: Box<FreeVarReference>,
+        severity: IssueSeverity,
+        inner: Option<Box<FreeVarReference>>,
     },
 }
 

turbopack/crates/turbopack-ecmascript/src/analyzer/mod.rs

@@ -641,10 +641,16 @@ impl TryFrom<&FreeVarReference> for JsValue {
                 false,
                 "compile time injected free var module",
             )),
-            FreeVarReference::Error(_) => Ok(JsValue::unknown_empty(
-                false,
-                "compile time injected free var error",
-            )),
+            FreeVarReference::ReportUsage { inner, .. } => {
+                if let Some(inner) = &inner {
+                    inner.as_ref().try_into()
+                } else {
+                    Ok(JsValue::unknown_empty(
+                        false,
+                        "compile time injected free var error",
+                    ))
+                }
+            }
             FreeVarReference::InputRelative(kind) => {
                 use turbopack_core::compile_time_info::InputRelativeConstant;
                 Ok(JsValue::unknown_empty(
@@ -659,7 +665,6 @@ impl TryFrom<&FreeVarReference> for JsValue {
                     },
                 ))
             }
-            FreeVarReference::Warning { inner, .. } => inner.as_ref().try_into(),
         }
     }
 }

turbopack/crates/turbopack-ecmascript/src/references/mod.rs

@@ -43,7 +43,7 @@ use swc_core::{
     common::{
         GLOBALS, Globals, Span, Spanned, SyntaxContext,
         comments::{CommentKind, Comments},
-        errors::{DiagnosticId, HANDLER, Handler},
+        errors::{DiagnosticId, HANDLER, Handler, Level},
         pass::AstNodePath,
         source_map::SmallPos,
     },
@@ -2909,13 +2909,6 @@ async fn handle_free_var_reference(
     }
 
     match value {
-        FreeVarReference::Error(error_message) => state.handler.span_err_with_code(
-            span,
-            error_message,
-            DiagnosticId::Error(
-                errors::failed_to_analyze::ecmascript::FREE_VAR_REFERENCE.to_string(),
-            ),
-        ),
         FreeVarReference::Value(value) => {
             analysis.add_code_gen(ConstantValueCodeGen::new(
                 value.clone(),
@@ -2998,18 +2991,34 @@ async fn handle_free_var_reference(
                 ast_path.to_vec().into(),
             ));
         }
-        FreeVarReference::Warning { message, inner } => {
-            state.handler.span_warn_with_code(
-                span,
+        FreeVarReference::ReportUsage {
+            message,
+            severity,
+            inner,
+        } => {
+            state.handler.emit_with_code(
+                &span.into(),
                 message,
                 DiagnosticId::Error(
                     errors::failed_to_analyze::ecmascript::FREE_VAR_REFERENCE.to_string(),
                 ),
+                match severity {
+                    IssueSeverity::Bug => Level::Bug,
+                    IssueSeverity::Fatal => Level::Fatal,
+                    IssueSeverity::Error => Level::Error,
+                    IssueSeverity::Warning => Level::Warning,
+                    IssueSeverity::Hint => Level::Help,
+                    IssueSeverity::Info | IssueSeverity::Note => Level::Note,
+                    IssueSeverity::Suggestion => Level::Cancelled,
+                },
             );
-            return Box::pin(handle_free_var_reference(
-                ast_path, inner, span, state, analysis,
-            ))
-            .await;
+
+            if let Some(inner) = inner {
+                return Box::pin(handle_free_var_reference(
+                    ast_path, inner, span, state, analysis,
+                ))
+                .await;
+            }
         }
     }
     Ok(true)

turbopack/crates/turbopack-tests/tests/snapshot.rs

@@ -42,7 +42,7 @@ use turbopack_core::{
     file_source::FileSource,
     free_var_references,
     ident::Layer,
-    issue::{CollectibleIssuesExt, IssueFilter},
+    issue::{CollectibleIssuesExt, IssueFilter, IssueSeverity},
     module::Module,
     module_graph::{
         ModuleGraph, SingleModuleGraph,
@@ -326,11 +326,12 @@ async fn run_test_operation(resource: RcStr) -> Result<Vc<FileSystemPath>> {
         .free_var_references(
             free_var_references!(
                 ..defines.into_iter(),
-                WARNED_VALUE = FreeVarReference::Warning {
+                WARNED_VALUE = FreeVarReference::ReportUsage {
+                    severity: IssueSeverity::Warning,
                     message: rcstr!("WARNED_VALUE is deprecated, use REPLACEMENT_VALUE instead"),
-                    inner: Box::new(FreeVarReference::Value(CompileTimeDefineValue::String(
-                        rcstr!("replacement")
-                    ),)),
+                    inner: Some(Box::new(FreeVarReference::Value(
+                        CompileTimeDefineValue::String(rcstr!("replacement"))
+                    ))),
                 },
             )
             .resolved_cell(),