Skip to content

fix:clear deps should not panic when module not found #1581

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
stormslowly merged 3 commits into from
Sep 13, 2024
Merged

fix:clear deps should not panic when module not found #1581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e96eb5b
fix:clear deps should not panic when module not found
Jinbao1001 Sep 11, 2024
c91862a
chore: use tracing warn
Jinbao1001 Sep 12, 2024
bd59294
fix: delete log
Jinbao1001 Sep 12, 2024
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
115 changes: 68 additions & 47 deletions crates/mako/src/module_graph.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use petgraph::prelude::{Dfs, EdgeRef};
use petgraph::stable_graph::{StableDiGraph, WalkNeighbors};
use petgraph::visit::IntoEdgeReferences;
use petgraph::Direction;
use tracing::debug;
use tracing::{debug, warn};

use crate::module::{Dependencies, Dependency, Module, ModuleId, ResolveType};

Expand Down Expand Up @@ -106,57 +106,78 @@ impl ModuleGraph {
}

pub fn clear_dependency(&mut self, from: &ModuleId, to: &ModuleId) {
let from_index = self.id_index_map.get(from).unwrap_or_else(|| {
panic!(
r#"from node "{}" does not exist in the module graph when remove edge"#,
from.id
)
});

let to_index = self.id_index_map.get(to).unwrap_or_else(|| {
panic!(
r#"to node "{}" does not exist in the module graph when remove edge"#,
to.id
)
});
let from_index = self.id_index_map.get(from).map_or_else(
|| {
warn!(
"clear from node {} does not exist in the module graph when remove edge",
from.id
);
None
},
Some,
);

self.graph
.find_edge(*from_index, *to_index)
.and_then(|edge| {
self.graph.remove_edge(edge);
None::<()>
});
let to_index = self.id_index_map.get(to).map_or_else(
|| {
warn!(
"clear to node {} does not exist in the module graph when remove edge",
to.id
);
None
},
Some,
);
if let (Some(from_index), Some(to_index)) = (from_index, to_index) {
self.graph
.find_edge(*from_index, *to_index)
.and_then(|edge| {
self.graph.remove_edge(edge);
None::<()>
});
}
}

pub fn remove_dependency(&mut self, from: &ModuleId, to: &ModuleId, dep: &Dependency) {
let from_index = self.id_index_map.get(from).unwrap_or_else(|| {
panic!(
r#"from node "{}" does not exist in the module graph when remove edge"#,
from.id
)
});

let to_index = self.id_index_map.get(to).unwrap_or_else(|| {
panic!(
r#"to node "{}" does not exist in the module graph when remove edge"#,
to.id
)
});

let edge = self
.graph
.find_edge(*from_index, *to_index)
.unwrap_or_else(|| {
panic!(
r#"edge "{}" -> "{}" does not exist in the module graph when remove edge"#,
from.id, to.id
)
});
let deps = self.graph.edge_weight_mut(edge).unwrap();
deps.remove(dep);
let from_index = self.id_index_map.get(from).map_or_else(
|| {
warn!(
"remove from node {} does not exist in the module graph when remove edge",
from.id
);
None
},
Some,
);

if deps.is_empty() {
self.graph.remove_edge(edge);
let to_index = self.id_index_map.get(to).map_or_else(
|| {
warn!(
"remove to node {} does not exist in the module graph when remove edge",
to.id
);
None
},
Some,
);
if let (Some(from_index), Some(to_index)) = (from_index, to_index) {
let edge = self.graph.find_edge(*from_index, *to_index).map_or_else(
|| {
warn!(
"edge {} -> {} does not exist in the module graph when remove edge",
from.id, to.id
);
None
},
Some,
);
if let Some(edge) = edge {
let deps = self.graph.edge_weight_mut(edge).unwrap();
deps.remove(dep);

if deps.is_empty() {
self.graph.remove_edge(edge);
}
}
}
}

Expand Down
4 changes: 0 additions & 4 deletions packages/mako/binding.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@

/* auto-generated by NAPI-RS */

export interface TransformOutput {
code: string;
map?: string;
}
export interface JsHooks {
name?: string;
load?: (
Expand Down