Skip to content

Commit

Permalink
🐛 - Fix rename issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@jfrolich
jfrolich committed Jul 24, 2023
1 parent a31adca commit 9b6057c
Show file tree
Hide file tree
Showing 3 changed files with 165 additions and 87 deletions.
93 changes: 55 additions & 38 deletions src/build.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ pub fn parse_packages(build_state: &mut BuildState) {
.entry(module_name.to_string())
.and_modify(|module| match module.source_type {
SourceType::SourceFile(ref mut source_file) => {
if source_file.implementation.path.len() > 0 {
if &source_file.implementation.path != file {
error!(
"Duplicate files found for module: {}",
&module_name
Expand Down Expand Up @@ -748,45 +748,62 @@ pub fn parse_packages(build_state: &mut BuildState) {
compile_dirty: true,
});
} else {
build_state
.modules
.entry(module_name.to_string())
.and_modify(|module| match module.source_type {
SourceType::SourceFile(ref mut source_file) => {
source_file.interface = Some(Interface {
path: file.to_owned(),
parse_state: ParseState::Pending,
compile_state: CompileState::Pending,
last_modified: metadata.modified,
dirty: true,
// remove last character of string: resi -> res, rei -> re, mli -> ml
let mut implementation_filename = file.to_owned();
implementation_filename.pop();
match source_files.get(&implementation_filename) {
None => {
println!(
"{}\rWarning: No implementation file found for interface file (skipping): {}",
LINE_CLEAR,
file
);
}
Some(_) => {

build_state
.modules
.entry(module_name.to_string())
.and_modify(|module| match module.source_type {
SourceType::SourceFile(ref mut source_file) => {
source_file.interface = Some(Interface {
path: file.to_owned(),
parse_state: ParseState::Pending,
compile_state: CompileState::Pending,
last_modified: metadata.modified,
dirty: true,
});
}
_ => (),
})
.or_insert(Module {
source_type: SourceType::SourceFile(SourceFile {
// this will be overwritten later
implementation: Implementation {
path: implementation_filename.to_string(),
parse_state: ParseState::Pending,
compile_state: CompileState::Pending,
last_modified: metadata.modified,
dirty: true,
},
interface: Some(Interface {
path: file.to_owned(),
parse_state: ParseState::Pending,
compile_state: CompileState::Pending,
last_modified: metadata.modified,
dirty: true,
}),
}),
deps: AHashSet::new(),
reverse_deps: AHashSet::new(),
package_name: package.name.to_owned(),
compile_dirty: true,
});
}
_ => (),
})
.or_insert(Module {
source_type: SourceType::SourceFile(SourceFile {
// this will be overwritten later
implementation: Implementation {
path: "".to_string(),
parse_state: ParseState::Pending,
compile_state: CompileState::Pending,
last_modified: metadata.modified,
dirty: false,
},
interface: Some(Interface {
path: file.to_owned(),
parse_state: ParseState::Pending,
compile_state: CompileState::Pending,
last_modified: metadata.modified,
dirty: true,
}),
}),
deps: AHashSet::new(),
reverse_deps: AHashSet::new(),
package_name: package.name.to_owned(),
compile_dirty: true,
});

}
}
}

}),
}
});
Expand Down
147 changes: 99 additions & 48 deletions src/clean.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pub fn get_res_path_from_ast(ast_file: &str) -> Option<String> {
return None;
}

fn remove_asts(source_file: &str, package_name: &str, root_path: &str, is_root: bool) {
fn remove_ast(source_file: &str, package_name: &str, root_path: &str, is_root: bool) {
let _ = std::fs::remove_file(helpers::get_compiler_asset(
source_file,
package_name,
Expand All @@ -35,6 +35,9 @@ fn remove_asts(source_file: &str, package_name: &str, root_path: &str, is_root:
"ast",
is_root,
));
}

fn remove_iast(source_file: &str, package_name: &str, root_path: &str, is_root: bool) {
let _ = std::fs::remove_file(helpers::get_compiler_asset(
source_file,
package_name,
Expand All @@ -46,7 +49,11 @@ fn remove_asts(source_file: &str, package_name: &str, root_path: &str, is_root:
}

fn remove_mjs_file(source_file: &str, suffix: &bsconfig::Suffix) {
let _ = std::fs::remove_file(helpers::change_extension(source_file, &suffix.to_string()));
let _ = std::fs::remove_file(helpers::change_extension(
source_file,
// suffix.to_string includes the ., so we need to remove it
&suffix.to_string()[1..],
));
}

fn remove_compile_assets(
Expand Down Expand Up @@ -137,10 +144,16 @@ pub fn cleanup_previous_build(build_state: &mut BuildState) -> (usize, usize, AH
let package = build_state.packages.get(&module.package_name).unwrap();

Some(
PathBuf::from(&package.package_dir)
.join(source_file.implementation.path.to_owned())
.to_string_lossy()
.to_string(),
PathBuf::from(helpers::get_package_path(
&build_state.project_root,
&module.package_name,
package.is_root,
))
.canonicalize()
.expect("Could not canonicalize")
.join(source_file.implementation.path.to_owned())
.to_string_lossy()
.to_string(),
)
}
_ => None,
Expand All @@ -154,10 +167,16 @@ pub fn cleanup_previous_build(build_state: &mut BuildState) -> (usize, usize, AH
.filter_map(|module| {
let package = build_state.packages.get(&module.package_name).unwrap();
build::get_interface(module).as_ref().map(|interface| {
PathBuf::from(&package.package_dir)
.join(interface.path.to_owned())
.to_string_lossy()
.to_string()
PathBuf::from(helpers::get_package_path(
&build_state.project_root,
&module.package_name,
package.is_root,
))
.canonicalize()
.expect("Could not canonicalize")
.join(interface.path.to_owned())
.to_string_lossy()
.to_string()
})
})
.collect::<AHashSet<String>>(),
Expand Down Expand Up @@ -240,37 +259,54 @@ pub fn cleanup_previous_build(build_state: &mut BuildState) -> (usize, usize, AH

let diff_len = diff.len();

diff.par_iter().for_each(|res_file_location| {
let (
_module_name,
package_name,
package_namespace,
_last_modified,
_ast_file_path,
is_root,
suffix,
) = ast_modules
.get(&res_file_location.to_string())
.expect("Could not find module name for ast file");

remove_asts(
res_file_location,
package_name,
&build_state.project_root,
*is_root,
);
remove_compile_assets(
res_file_location,
package_name,
package_namespace,
&build_state.project_root,
*is_root,
);
remove_mjs_file(
&res_file_location,
&suffix.to_owned().unwrap_or(bsconfig::Suffix::Mjs),
);
});
let deleted_interfaces = diff
.par_iter()
.map(|res_file_location| {
let (
module_name,
package_name,
package_namespace,
_last_modified,
ast_file_path,
is_root,
suffix,
) = ast_modules
.get(&res_file_location.to_string())
.expect("Could not find module name for ast file");
remove_compile_assets(
res_file_location,
package_name,
package_namespace,
&build_state.project_root,
*is_root,
);
println!("Removing mjs file: {}", res_file_location);
remove_mjs_file(
&res_file_location,
&suffix.to_owned().unwrap_or(bsconfig::Suffix::Mjs),
);
remove_iast(
res_file_location,
package_name,
&build_state.project_root,
*is_root,
);
remove_ast(
res_file_location,
package_name,
&build_state.project_root,
*is_root,
);
match helpers::get_extension(ast_file_path).as_str() {
"iast" => Some(module_name.to_owned()),
"ast" => None,
_ => None,
}
})
.collect::<Vec<Option<String>>>()
.iter()
.filter_map(|module_name| module_name.to_owned())
.collect::<AHashSet<String>>();

ast_rescript_file_locations
.intersection(&rescript_file_locations)
Expand All @@ -279,7 +315,7 @@ pub fn cleanup_previous_build(build_state: &mut BuildState) -> (usize, usize, AH
let (
module_name,
_package_name,
package_namespace,
_package_namespace,
ast_last_modified,
ast_file_path,
_is_root,
Expand All @@ -291,8 +327,7 @@ pub fn cleanup_previous_build(build_state: &mut BuildState) -> (usize, usize, AH
.modules
.get_mut(module_name)
.expect("Could not find module for ast file");
let full_module_name =
helpers::module_name_with_namespace(module_name, &package_namespace);
let full_module_name = module_name.to_owned();

let compile_dirty = cmi_modules.get(&full_module_name);
if let Some(compile_dirty) = compile_dirty {
Expand Down Expand Up @@ -325,7 +360,9 @@ pub fn cleanup_previous_build(build_state: &mut BuildState) -> (usize, usize, AH
};

if let Some(last_modified) = last_modified {
if compile_dirty > &last_modified {
if compile_dirty > &last_modified
&& !deleted_interfaces.contains(&full_module_name)
{
module.compile_dirty = false;
}
}
Expand All @@ -347,7 +384,9 @@ pub fn cleanup_previous_build(build_state: &mut BuildState) -> (usize, usize, AH
} else {
let implementation = &mut source_file.implementation;
let source_last_modified = implementation.last_modified;
if ast_last_modified > &source_last_modified {
if ast_last_modified > &source_last_modified
&& !deleted_interfaces.contains(module_name)
{
implementation.dirty = false;
}
}
Expand All @@ -357,7 +396,13 @@ pub fn cleanup_previous_build(build_state: &mut BuildState) -> (usize, usize, AH

let ast_module_names = ast_modules
.values()
.map(|(module_name, _, _, _, _, _, _)| module_name)
.filter_map(|(module_name, _, _, _, ast_file_path, _, _)| {
match helpers::get_extension(ast_file_path).as_str() {
"iast" => None,
"ast" => Some(module_name),
_ => None,
}
})
.collect::<AHashSet<&String>>();

let all_module_names = build_state
Expand Down Expand Up @@ -437,7 +482,13 @@ pub fn cleanup_after_build(build_state: &BuildState) {
if failed_to_parse(module) {
match &module.source_type {
SourceType::SourceFile(source_file) => {
remove_asts(
remove_iast(
&source_file.implementation.path,
&module.package_name,
&build_state.project_root,
package.is_root,
);
remove_ast(
&source_file.implementation.path,
&module.package_name,
&build_state.project_root,
Expand Down
12 changes: 11 additions & 1 deletion src/helpers.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ pub fn get_basename(path: &str) -> String {
.file_stem()
.expect("Could not get basename")
.to_str()
.expect("Could not get basename")
.expect("Could not get basename 2")
.to_string();
}

Expand Down Expand Up @@ -340,3 +340,13 @@ pub fn is_non_exotic_module_name(module_name: &str) -> bool {
}
return false;
}

pub fn get_extension(path: &str) -> String {
let path_buf = PathBuf::from(path);
return path_buf
.extension()
.expect("Could not get extension")
.to_str()
.expect("Could not get extension 2")
.to_string();
}

0 comments on commit 9b6057c

Please sign in to comment.