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.

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

feat(rspack_plugin_javascript): improve provide dependency #7871

Merged
merged 3 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use itertools::Itertools;
use rspack_core::DependencyType;
use rspack_core::{
create_exports_object_referenced, module_raw, Compilation, ExtendedReferencedExport, ModuleGraph,
NormalInitFragment, RuntimeSpec, UsedName,
create_exports_object_referenced, module_raw, Compilation, DependencyType,
ExtendedReferencedExport, ModuleGraph, NormalInitFragment, RealDependencyLocation, RuntimeSpec,
UsedName,
};
use rspack_core::{AsContextDependency, Dependency, InitFragmentKey, InitFragmentStage};
use rspack_core::{DependencyCategory, DependencyId, DependencyTemplate};
Expand All @@ -12,19 +12,22 @@ use swc_core::atoms::Atom;

#[derive(Debug, Clone)]
pub struct ProvideDependency {
start: u32,
end: u32,
id: DependencyId,
request: Atom,
identifier: String,
ids: Vec<Atom>,
range: RealDependencyLocation,
}

impl ProvideDependency {
pub fn new(start: u32, end: u32, request: Atom, identifier: String, ids: Vec<Atom>) -> Self {
pub fn new(
range: RealDependencyLocation,
request: Atom,
identifier: String,
ids: Vec<Atom>,
) -> Self {
Self {
start,
end,
range,
request,
identifier,
ids,
Expand All @@ -38,6 +41,10 @@ impl Dependency for ProvideDependency {
&self.id
}

fn loc(&self) -> Option<String> {
Some(self.range.to_string())
}

fn category(&self) -> &DependencyCategory {
&DependencyCategory::Esm
}
Expand Down Expand Up @@ -116,7 +123,7 @@ impl DependencyTemplate for ProvideDependency {
InitFragmentKey::ModuleExternal(format!("provided {}", self.identifier)),
None,
)));
source.replace(self.start, self.end, &self.identifier, None);
source.replace(self.range.start, self.range.end, &self.identifier, None);
}

fn dependency_id(&self) -> Option<DependencyId> {
Expand Down
36 changes: 19 additions & 17 deletions crates/rspack_plugin_javascript/src/parser_plugin/provide_plugin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use itertools::Itertools;
use once_cell::sync::OnceCell;
use rspack_core::{
ApplyContext, CompilerOptions, ModuleType, NormalModuleFactoryParser, ParserAndGenerator,
ParserOptions, Plugin, PluginContext, SpanExt,
ParserOptions, Plugin, PluginContext, RealDependencyLocation,
};
use rspack_error::Result;
use rspack_hook::{plugin, plugin_hook};
Expand All @@ -13,20 +13,22 @@ use crate::{
dependency::ProvideDependency, parser_and_generator::JavaScriptParserAndGenerator,
visitors::JavascriptParser, BoxJavascriptParserPlugin,
};

const SOURCE_DOT: &str = r#"."#;
const MODULE_DOT: &str = r#"_dot_"#;

fn dep(value: &ProvideValue, name: &str, start: u32, end: u32) -> Option<ProvideDependency> {
fn create_provide_dep(
name: &str,
value: &ProvideValue,
range: RealDependencyLocation,
) -> Option<ProvideDependency> {
if let Some(requests) = value.get(name) {
let name_identifier = if name.contains(SOURCE_DOT) {
format!("__webpack_provide_{}", name.replace(SOURCE_DOT, MODULE_DOT))
} else {
name.to_string()
};
return Some(ProvideDependency::new(
start,
end,
range,
Atom::from(requests[0].as_str()),
name_identifier,
requests[1..]
Expand Down Expand Up @@ -84,11 +86,11 @@ impl JavascriptParserPlugin for ProvidePlugin {
expr: &swc_core::ecma::ast::CallExpr,
for_name: &str,
) -> Option<bool> {
dep(
&self.provide,
let range: RealDependencyLocation = expr.callee.span().into();
create_provide_dep(
for_name,
expr.callee.span().real_lo(),
expr.callee.span().real_hi(),
&self.provide,
range.with_source(parser.source_map.clone()),
)
.map(|dep| {
parser.dependencies.push(Box::new(dep));
Expand All @@ -104,11 +106,11 @@ impl JavascriptParserPlugin for ProvidePlugin {
expr: &swc_core::ecma::ast::MemberExpr,
for_name: &str,
) -> Option<bool> {
dep(
&self.provide,
let range: RealDependencyLocation = expr.span().into();
create_provide_dep(
for_name,
expr.span().real_lo(),
expr.span().real_hi(),
&self.provide,
range.with_source(parser.source_map.clone()),
)
.map(|dep| {
parser.dependencies.push(Box::new(dep));
Expand All @@ -122,11 +124,11 @@ impl JavascriptParserPlugin for ProvidePlugin {
ident: &swc_core::ecma::ast::Ident,
for_name: &str,
) -> Option<bool> {
dep(
&self.provide,
let range: RealDependencyLocation = ident.span.into();
create_provide_dep(
for_name,
ident.span.real_lo(),
ident.span.real_hi(),
&self.provide,
range.with_source(parser.source_map.clone()),
)
.map(|dep| {
parser.dependencies.push(Box::new(dep));
Expand Down
Loading