Skip to content

chore: optimize resolver logic #2178

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
ErKeLost wants to merge 2 commits into
base: v2-dev
Choose a base branch
from
Open

chore: optimize resolver logic #2178

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4791e90
chore: optimize resolver logic
ErKeLost Jun 12, 2025
3ceaa6c
Merge branch 'v2-dev' into chore/optimize-resolver
ErKeLost Jun 24, 2025
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
62 changes: 31 additions & 31 deletions crates/plugin_resolve/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,27 +48,24 @@ impl Plugin for FarmPluginResolve {
hook_context: &PluginHookContext,
) -> Result<Option<PluginResolveHookResult>> {
farm_profile_function!("plugin_resolve::resolve".to_string());

let external_config = self
.external_config
.get_or_init(|| ExternalConfig::from(&*context.config));

let source = &param.source;

let query = parse_query(source);
// split query from source
let splits: Vec<&str> = source.split('?').collect();
let source = splits[0];
let (source, query) = if let Some(pos) = source.find('?') {
(&source[..pos], parse_query(&source[pos + 1..]))
} else {
(source.as_str(), vec![])
};

let basedir =
if parse_package_source(source).is_some_and(|r| self.dedupe.contains(&r.package_name)) {
Path::new(&self.root).to_path_buf()
} else if let Some(importer) = &param.importer {
if let Some(p) = Path::new(&importer.resolved_path(&context.config.root)).parent() {
p.to_path_buf()
} else {
Path::new(&importer.resolved_path(&context.config.root)).to_path_buf()
}
let resolved_path = importer.resolved_path(&context.config.root);
let path = Path::new(&resolved_path);
path.parent().unwrap_or(path).to_path_buf()
} else {
Path::new(&self.root).to_path_buf()
};
Expand All @@ -89,17 +86,18 @@ impl Plugin for FarmPluginResolve {
}

let dynamic_extensions =
if let Some(dynamic_extensions) = hook_context.meta.get(DYNAMIC_EXTENSION_PRIORITY) {
let exts = serde_json::from_str::<Vec<String>>(dynamic_extensions).unwrap_or_default();

if exts.len() > 0 {
Some(exts)
} else {
None
}
} else {
None
};
hook_context
.meta
.get(DYNAMIC_EXTENSION_PRIORITY)
.and_then(|extensions| {
let exts = serde_json::from_str::<Vec<String>>(extensions).unwrap_or_default();
if !exts.is_empty() {
Some(exts)
} else {
None
}
});

let resolve_options = ResolveOptions { dynamic_extensions };

let resolver = &self.resolver;
Expand All @@ -112,15 +110,17 @@ impl Plugin for FarmPluginResolve {
);

// remove the .js if the result is not found to support using native esm with typescript
let mut resolve_result = if result.is_none() && source.ends_with(".js") {
farm_profile_scope!("plugin_resolve::resolve::remove_dot_js".to_string());
let source = source.replace(".js", "");

resolver
.resolve(&source, basedir, &param.kind, &resolve_options, context)
.map(|result| PluginResolveHookResult { query, ..result })
} else {
result.map(|result| PluginResolveHookResult { query, ..result })
let mut resolve_result = match result {
Some(result) => Some(PluginResolveHookResult { query, ..result }),
None if source.ends_with(".js") => {
farm_profile_scope!("plugin_resolve::resolve::remove_dot_js".to_string());
let source = source.replace(".js", "");

resolver
.resolve(&source, basedir, &param.kind, &resolve_options, context)
.map(|result| PluginResolveHookResult { query, ..result })
}
None => None,
};

if resolve_result.is_none() && context.config.resolve.auto_external_failed_resolve {
Expand Down
Loading