Skip to content

feat: support import defer in module graph #640

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

Merged
bartlomieju merged 1 commit into from
Apr 20, 2026
Merged

feat: support import defer in module graph #640

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
2 changes: 2 additions & 0 deletions src/analysis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ impl ImportAttributes {
pub enum DynamicDependencyKind {
#[default]
Import,
ImportDefer,
ImportSource,
Require,
}
Expand All @@ -106,6 +107,7 @@ pub enum DynamicDependencyKind {
#[serde(rename_all = "camelCase")]
pub enum StaticDependencyKind {
Import,
ImportDefer,
ImportSource,
ImportType,
ImportEquals,
Expand Down
4 changes: 2 additions & 2 deletions src/ast/dep.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ impl Visit for DependencyCollector<'_> {
(true, _) => StaticDependencyKind::ImportType,
(false, ImportPhase::Evaluation) => StaticDependencyKind::Import,
(false, ImportPhase::Source) => StaticDependencyKind::ImportSource,
(false, ImportPhase::Defer) => return,
(false, ImportPhase::Defer) => StaticDependencyKind::ImportDefer,
};
self.items.push(
StaticDependencyDescriptor {
Expand Down Expand Up @@ -247,7 +247,7 @@ impl Visit for DependencyCollector<'_> {
Callee::Import(import) => match import.phase {
ImportPhase::Evaluation => DynamicDependencyKind::Import,
ImportPhase::Source => DynamicDependencyKind::ImportSource,
ImportPhase::Defer => return,
ImportPhase::Defer => DynamicDependencyKind::ImportDefer,
},
_ if self.is_require(&node.callee) => DynamicDependencyKind::Require,
_ => return,
Expand Down
6 changes: 5 additions & 1 deletion src/graph.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3892,6 +3892,7 @@ fn fill_module_dependencies(
}
StaticDependencyKind::ImportSource => ImportKind::EsSource,
StaticDependencyKind::Import
| StaticDependencyKind::ImportDefer
| StaticDependencyKind::ImportEquals
| StaticDependencyKind::Export
| StaticDependencyKind::ExportEquals => ImportKind::Es,
Expand All @@ -3904,6 +3905,7 @@ fn fill_module_dependencies(
range: desc.specifier_range,
resolution_mode: match desc.kind {
StaticDependencyKind::Import
| StaticDependencyKind::ImportDefer
| StaticDependencyKind::ImportSource
| StaticDependencyKind::Export
| StaticDependencyKind::ImportType
Expand Down Expand Up @@ -3970,6 +3972,7 @@ fn fill_module_dependencies(
range: desc.argument_range,
resolution_mode: match desc.kind {
DynamicDependencyKind::Import
| DynamicDependencyKind::ImportDefer
| DynamicDependencyKind::ImportSource => {
if media_type.is_declaration() {
None
Expand All @@ -3986,7 +3989,8 @@ fn fill_module_dependencies(
.map(|specifier| Import {
specifier,
kind: match desc.kind {
DynamicDependencyKind::Import => ImportKind::Es,
DynamicDependencyKind::Import
| DynamicDependencyKind::ImportDefer => ImportKind::Es,
DynamicDependencyKind::ImportSource => ImportKind::EsSource,
DynamicDependencyKind::Require => ImportKind::Require,
},
Expand Down
Loading