hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-23 05:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add audit plan for slugify branch pass 3 and implement critical fixes

Browse source 
- Introduced a comprehensive audit plan for the slugify branch, detailing findings from a holistic review of 110 files, including 1 critical bug and 2 correctness issues.
- Completed todos addressing model JSON renaming, syncback updates, and test enhancements for roundtrip fidelity.
- Added tests for reserved names and ensured correct handling of slugified instances, preserving compound extensions in model files.
- Refactored change processing logic to correctly manage the `name` field in model files, enhancing metadata handling and ensuring compliance with round-trip identity standards.
This commit is contained in:
Joe 2026-02-11 01:31:09 -06:00
parent 2a917bf8e1
commit bb266789c0
14 changed files with 843 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/web/api.rs
View file

@ -1072,7 +1072,18 @@ impl ApiService {
if existing_path.is_dir() {
// Update init.meta.json5 if needed
if !added.properties.is_empty() {
self.write_init_meta_json(existing_path, added, None)?;
// Preserve the name field if the directory slug differs
// from the instance name (due to slugification/dedup).
let dir_name = existing_path
.file_name()
.and_then(|f| f.to_str())
.unwrap_or("");
let instance_name = if dir_name != added.name {
Some(added.name.as_str())
} else {
None
};
self.write_init_meta_json(existing_path, added, instance_name)?;
log::info!(
"Syncback: Updated existing {} at {}/init.meta.json5",
class_name,
@ -1090,7 +1101,19 @@ impl ApiService {
}
} else {
// It's a standalone file (e.g., .model.json5)
let content = self.serialize_instance_to_model_json(added, None)?;
// Preserve the name field if the filesystem slug differs
// from the instance name (due to slugification/dedup).
let stem = existing_path
.file_stem()
.and_then(|s| s.to_str())
.unwrap_or("");
let base = crate::syncback::strip_script_suffix(stem);
let instance_name = if base != added.name {
Some(added.name.as_str())
} else {
None
};
let content = self.serialize_instance_to_model_json(added, instance_name)?;
self.suppress_path(existing_path);
fs::write(existing_path, &content).with_context(|| {
format!("Failed to write file: {}", existing_path.display())
@ -1393,6 +1416,26 @@ impl ApiService {
return false;
}
log::info!("Syncback: Removed directory at {}", path.display());
// Also remove adjacent dir-level meta in the parent if it
// exists (e.g. parent/DirName.meta.json5), matching the
// init-file case below.
if let Some(parent) = path.parent() {
if let Some(dir_name) = path.file_name().and_then(|f| f.to_str()) {
let dir_meta = parent.join(format!("{}.meta.json5", dir_name));
if dir_meta.exists() {
self.suppress_path_remove(&dir_meta);
if let Err(err) = fs::remove_file(&dir_meta) {
log::warn!(
"Failed to remove dir-level meta file {}: {}",
dir_meta.display(),
err
);
}
}
}
}
return true;
}