refactor: use real_hi for evaluation range (#11549)

Author: ahabhgk

Cargo.lock

@@ -26,7 +26,9 @@ use rspack_javascript_compiler::ast::Ast;
 use rspack_sources::{
   BoxSource, CachedSource, ConcatSource, RawStringSource, ReplaceSource, Source, SourceExt,
 };
-use rspack_util::{ext::DynHash, itoa, json_stringify, source_map::SourceMapKind, swc::join_atom};
+use rspack_util::{
+  SpanExt, ext::DynHash, itoa, json_stringify, source_map::SourceMapKind, swc::join_atom,
+};
 use rustc_hash::{FxHashMap as HashMap, FxHashSet as HashSet, FxHasher};
 use swc_core::{
   common::{FileName, Spanned, SyntaxContext},
@@ -46,17 +48,17 @@ use crate::{
   CodeGenerationExportsFinalNames, CodeGenerationPublicPathAutoReplace, CodeGenerationResult,
   Compilation, ConcatenatedModuleIdent, ConcatenationScope, ConditionalInitFragment,
   ConnectionState, Context, DEFAULT_EXPORT, DependenciesBlock, DependencyId, DependencyType,
-  ErrorSpan, ExportProvided, ExportsArgument, ExportsInfoGetter, ExportsType, FactoryMeta,
-  GetUsedNameParam, IdentCollector, InitFragment, InitFragmentStage, LibIdentOptions,
+  ExportProvided, ExportsArgument, ExportsInfoGetter, ExportsType, FactoryMeta, GetUsedNameParam,
+  IdentCollector, InitFragment, InitFragmentStage, LibIdentOptions,
   MaybeDynamicTargetExportInfoHashKey, Module, ModuleArgument, ModuleGraph,
   ModuleGraphCacheArtifact, ModuleGraphConnection, ModuleIdentifier, ModuleLayer,
   ModuleStaticCacheArtifact, ModuleType, NAMESPACE_OBJECT_EXPORT, PrefetchExportsInfoMode, Resolve,
-  RuntimeCondition, RuntimeGlobals, RuntimeSpec, SourceType, SpanExt, UsageState, UsedName,
-  UsedNameItem, define_es_module_flag_statement, escape_identifier, filter_runtime,
-  get_runtime_key, impl_source_map_config, merge_runtime_condition,
-  merge_runtime_condition_non_false, module_update_hash, property_access, property_name,
-  reserved_names::RESERVED_NAMES, returning_function, runtime_condition_expression,
-  subtract_runtime_condition, to_identifier_with_escaped, to_normal_comment,
+  RuntimeCondition, RuntimeGlobals, RuntimeSpec, SourceType, UsageState, UsedName, UsedNameItem,
+  define_es_module_flag_statement, escape_identifier, filter_runtime, get_runtime_key,
+  impl_source_map_config, merge_runtime_condition, merge_runtime_condition_non_false,
+  module_update_hash, property_access, property_name, reserved_names::RESERVED_NAMES,
+  returning_function, runtime_condition_expression, subtract_runtime_condition,
+  to_identifier_with_escaped, to_normal_comment,
 };
 
 type ExportsDefinitionArgs = Vec<(String, String)>;
@@ -2003,14 +2005,12 @@ impl ConcatenatedModule {
       ) {
         Ok(res) => Program::Module(res),
         Err(err) => {
-          let span: ErrorSpan = err.span().into();
-
           // return empty error as we already push error to compilation.diagnostics
           return Err(
             rspack_error::TraceableError::from_source_file(
               &fm,
-              span.start as usize,
-              span.end as usize,
+              err.span().real_lo() as usize,
+              err.span().real_hi() as usize,
               "JavaScript parse error:\n".to_string(),
               err.kind().msg().to_string(),
             )

crates/rspack_core/src/concatenated_module.rs

@@ -12,11 +12,10 @@ use tracing::instrument;
 
 use crate::{
   BoxDependency, CompilationId, ContextElementDependency, ContextModule, ContextModuleOptions,
-  DependencyCategory, DependencyId, DependencyType, ErrorSpan, FactoryMeta, ModuleExt,
-  ModuleFactory, ModuleFactoryCreateData, ModuleFactoryResult, ModuleIdentifier, RawModule,
-  ResolveArgs, ResolveContextModuleDependencies, ResolveInnerOptions,
-  ResolveOptionsWithDependencyType, ResolveResult, Resolver, ResolverFactory, SharedPluginDriver,
-  resolve,
+  DependencyCategory, DependencyId, DependencyType, FactoryMeta, ModuleExt, ModuleFactory,
+  ModuleFactoryCreateData, ModuleFactoryResult, ModuleIdentifier, RawModule, ResolveArgs,
+  ResolveContextModuleDependencies, ResolveInnerOptions, ResolveOptionsWithDependencyType,
+  ResolveResult, Resolver, ResolverFactory, SharedPluginDriver, resolve,
 };
 
 #[derive(Debug)]
@@ -279,9 +278,7 @@ impl ContextModuleFactory {
       specifier: specifier.as_str(),
       dependency_type: dependency.dependency_type(),
       dependency_category: dependency.category(),
-      span: dependency
-        .range()
-        .map(|range| ErrorSpan::new(range.start, range.end)),
+      span: dependency.range(),
       resolve_options: data.resolve_options.clone(),
       resolve_to_context: true,
       optional: dependency.get_optional(),

crates/rspack_core/src/context_module_factory.rs

@@ -5,11 +5,12 @@ use std::{
 
 use rspack_cacheable::cacheable;
 use rspack_location::{DependencyLocation, RealDependencyLocation, SourcePosition};
+use rspack_util::SpanExt;
 
 /// Represents a range in a dependency, typically used for tracking the span of code in a source file.
 /// It stores the start and end positions (as offsets) of the range, typically using base-0 indexing.
 #[cacheable]
-#[derive(Debug, Clone, Hash, Eq, PartialEq)]
+#[derive(Debug, Clone, Copy, Hash, Eq, PartialEq)]
 pub struct DependencyRange {
   pub end: u32,
   pub start: u32,
@@ -27,8 +28,8 @@ impl From<(u32, u32)> for DependencyRange {
 impl From<swc_core::common::Span> for DependencyRange {
   fn from(span: swc_core::common::Span) -> Self {
     Self {
-      start: span.lo.0.saturating_sub(1),
-      end: span.hi.0.saturating_sub(1),
+      start: span.real_lo(),
+      end: span.real_hi(),
     }
   }
 }

crates/rspack_core/src/dependency/dependency_location.rs

@@ -83,7 +83,7 @@ pub trait Dependency:
     None
   }
 
-  fn range(&self) -> Option<&DependencyRange> {
+  fn range(&self) -> Option<DependencyRange> {
     None
   }
 

crates/rspack_core/src/dependency/dependency_trait.rs

@@ -14,7 +14,6 @@ mod loader_import;
 mod module_dependency;
 mod runtime_requirements_dependency;
 mod runtime_template;
-mod span;
 mod static_exports_dependency;
 
 use std::sync::Arc;
@@ -39,7 +38,6 @@ pub use runtime_requirements_dependency::{
 pub use runtime_template::*;
 use rustc_hash::{FxHashMap, FxHashSet};
 use serde::Serialize;
-pub use span::SpanExt;
 pub use static_exports_dependency::{StaticExportsDependency, StaticExportsSpec};
 use swc_core::ecma::atoms::Atom;
 

crates/rspack_core/src/dependency/mod.rs

@@ -2,7 +2,7 @@ use dyn_clone::clone_trait_object;
 use rspack_cacheable::cacheable_dyn;
 
 use super::{Dependency, FactorizeInfo};
-use crate::{DependencyCondition, ErrorSpan};
+use crate::DependencyCondition;
 
 #[cacheable_dyn]
 pub trait ModuleDependency: Dependency {
@@ -12,16 +12,6 @@ pub trait ModuleDependency: Dependency {
     self.request()
   }
 
-  /// Span for precise source location.
-  /// For example: the source node in an `ImportDeclaration`.
-  /// This is only intended used to display better diagnostics.
-  /// So it might not be precise as it is using [crate::Dependency::span] as the default value.
-  fn source_span(&self) -> Option<ErrorSpan> {
-    self
-      .range()
-      .map(|range| ErrorSpan::new(range.start, range.end))
-  }
-
   fn weak(&self) -> bool {
     self.lazy().is_some()
   }

crates/rspack_core/src/dependency/module_dependency.rs

@@ -3,7 +3,7 @@ use std::fmt::Display;
 use itertools::Itertools;
 use rspack_error::{
   DiagnosticExt, Error, TraceableError, error, impl_diagnostic_transparent,
-  miette::{self, Diagnostic},
+  miette::{self, Diagnostic, diagnostic},
   thiserror::{self, Error},
 };
 use rspack_util::ext::AsAny;
@@ -17,16 +17,19 @@ use crate::{BoxLoader, DependencyRange};
 pub struct EmptyDependency(Box<dyn Diagnostic + Send + Sync>);
 
 impl EmptyDependency {
-  pub fn new(span: DependencyRange) -> Self {
-    Self(
+  pub fn new(span: Option<DependencyRange>) -> Self {
+    let err = if let Some(span) = span {
       TraceableError::from_lazy_file(
         span.start as usize,
         span.end as usize,
         "Empty dependency".to_string(),
         "Expected a non-empty request".to_string(),
       )
-      .boxed(),
-    )
+      .boxed()
+    } else {
+      diagnostic!(code = "Empty dependency", "Expected a non-empty request").into()
+    };
+    Self(err)
   }
 }
 

crates/rspack_core/src/diagnostics.rs

@@ -1,26 +1,24 @@
 use std::{borrow::Cow, sync::Arc};
 
-use rspack_cacheable::cacheable;
 use rspack_error::{Result, error};
 use rspack_hook::define_hook;
 use rspack_loader_runner::{Loader, Scheme, get_scheme};
 use rspack_paths::Utf8PathBuf;
 use rspack_util::MergeFrom;
 use sugar_path::SugarPath;
-use swc_core::common::Span;
 use winnow::prelude::*;
 
 use crate::{
   AssetInlineGeneratorOptions, AssetResourceGeneratorOptions, BoxLoader, BoxModule,
   CompilerOptions, Context, CssAutoGeneratorOptions, CssAutoParserOptions,
-  CssModuleGeneratorOptions, CssModuleParserOptions, Dependency, DependencyCategory,
-  DependencyRange, FactoryMeta, FuncUseCtx, GeneratorOptions, ModuleExt, ModuleFactory,
-  ModuleFactoryCreateData, ModuleFactoryResult, ModuleIdentifier, ModuleLayer, ModuleRuleEffect,
-  ModuleRuleEnforce, ModuleRuleUse, ModuleRuleUseLoader, ModuleType, NormalModule,
-  ParserAndGenerator, ParserOptions, RawModule, Resolve, ResolveArgs,
-  ResolveOptionsWithDependencyType, ResolveResult, Resolver, ResolverFactory, ResourceData,
-  ResourceParsedData, RunnerContext, SharedPluginDriver, diagnostics::EmptyDependency,
-  module_rules_matcher, parse_resource, resolve, stringify_loaders_and_resource,
+  CssModuleGeneratorOptions, CssModuleParserOptions, Dependency, DependencyCategory, FactoryMeta,
+  FuncUseCtx, GeneratorOptions, ModuleExt, ModuleFactory, ModuleFactoryCreateData,
+  ModuleFactoryResult, ModuleIdentifier, ModuleLayer, ModuleRuleEffect, ModuleRuleEnforce,
+  ModuleRuleUse, ModuleRuleUseLoader, ModuleType, NormalModule, ParserAndGenerator, ParserOptions,
+  RawModule, Resolve, ResolveArgs, ResolveOptionsWithDependencyType, ResolveResult, Resolver,
+  ResolverFactory, ResourceData, ResourceParsedData, RunnerContext, SharedPluginDriver,
+  diagnostics::EmptyDependency, module_rules_matcher, parse_resource, resolve,
+  stringify_loaders_and_resource,
 };
 
 define_hook!(NormalModuleFactoryBeforeResolve: SeriesBail(data: &mut ModuleFactoryCreateData) -> bool,tracing=false);
@@ -133,7 +131,7 @@ impl NormalModuleFactory {
       .expect("should be module dependency");
     let dependency_type = *dependency.dependency_type();
     let dependency_category = *dependency.category();
-    let dependency_source_span = dependency.source_span();
+    let dependency_range = dependency.range();
     let dependency_optional = dependency.get_optional();
 
     let importer = data.issuer_identifier;
@@ -218,8 +216,7 @@ impl NormalModuleFactory {
         let second_char = request.next();
 
         if first_char.is_none() {
-          let span = dependency.source_span().unwrap_or_default();
-          return Err(EmptyDependency::new(DependencyRange::new(span.start, span.end)).into());
+          return Err(EmptyDependency::new(dependency.range()).into());
         }
 
         // See: https://webpack.js.org/concepts/loaders/#inline
@@ -314,7 +311,7 @@ impl NormalModuleFactory {
           specifier: &resource,
           dependency_type: &dependency_type,
           dependency_category: &dependency_category,
-          span: dependency_source_span,
+          span: dependency_range,
           resolve_options: data.resolve_options.clone(),
           resolve_to_context: false,
           optional: dependency_optional,
@@ -884,32 +881,6 @@ async fn resolve_each(
     .ok_or_else(|| error!("Unable to resolve loader {}", l.loader))
 }
 
-/// Using `u32` instead of `usize` to reduce memory usage,
-/// `u32` is 4 bytes on 64bit machine, comparing to `usize` which is 8 bytes.
-/// ## Warning
-/// [ErrorSpan] start from zero, and `Span` of `swc` start from one. see https://swc-css.netlify.app/?code=eJzLzC3ILypRSFRIK8rPVVAvSS0u0csqVgcAZaoIKg
-#[cacheable]
-#[derive(Debug, Hash, PartialEq, Eq, Clone, Copy, Default, PartialOrd, Ord)]
-pub struct ErrorSpan {
-  pub start: u32,
-  pub end: u32,
-}
-
-impl ErrorSpan {
-  pub fn new(start: u32, end: u32) -> Self {
-    Self { start, end }
-  }
-}
-
-impl From<Span> for ErrorSpan {
-  fn from(span: Span) -> Self {
-    Self {
-      start: span.lo.0.saturating_sub(1),
-      end: span.hi.0.saturating_sub(1),
-    }
-  }
-}
-
 #[derive(Debug)]
 pub struct NormalModuleCreateData {
   pub raw_request: String,

crates/rspack_core/src/normal_module_factory.rs

@@ -22,7 +22,7 @@ pub use self::{
   resolver_impl::{ResolveInnerError, ResolveInnerOptions, Resolver},
 };
 use crate::{
-  Context, DependencyCategory, DependencyType, ErrorSpan, ModuleIdentifier, Resolve,
+  Context, DependencyCategory, DependencyRange, DependencyType, ModuleIdentifier, Resolve,
   SharedPluginDriver,
 };
 
@@ -43,7 +43,7 @@ pub struct ResolveArgs<'a> {
   pub specifier: &'a str,
   pub dependency_type: &'a DependencyType,
   pub dependency_category: &'a DependencyCategory,
-  pub span: Option<ErrorSpan>,
+  pub span: Option<DependencyRange>,
   pub resolve_options: Option<Arc<Resolve>>,
   pub resolve_to_context: bool,
   pub optional: bool,