pesde-pkg/pesde
1
1
Fork 0
mirror of https://github.com/pesde-pkg/pesde.git synced 2025-04-05 11:20:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix(wally-compat): 🐛 correct linking file paths

Browse source
This commit is contained in:
daimond113 2024-03-24 19:27:10 +01:00
parent ba6c218847
commit 194687ca67
No known key found for this signature in database
GPG key ID: 3A8ECE51328B513C
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/dependencies/mod.rs
View file

@ -259,7 +259,7 @@ pub enum ConvertManifestsError {
#[cfg(feature = "wally")] #[cfg(feature = "wally")]
#[error("error parsing the sourcemap")] #[error("error parsing the sourcemap")]
Parse(#[from] serde_json::Error), Parse(#[from] serde_json::Error),
/// An error that occurred while writing the manifest /// An error that occurred while writing the manifest
#[error("error writing the manifest")] #[error("error writing the manifest")]
Write(#[from] serde_yaml::Error), Write(#[from] serde_yaml::Error),
@ -358,8 +358,11 @@ impl Project {
.is_some_and(|ext| ext == "lua" || ext == "luau") .is_some_and(|ext| ext == "lua" || ext == "luau")
}) })
.or_else(|| Some(relative_path::RelativePathBuf::from("true"))); .or_else(|| Some(relative_path::RelativePathBuf::from("true")));
serde_yaml::to_writer(&std::fs::File::create(&source.join(crate::MANIFEST_FILE_NAME))?, &manifest)?; serde_yaml::to_writer(
&std::fs::File::create(&source.join(crate::MANIFEST_FILE_NAME))?,
&manifest,
)?;
} }
} }

13
src/linking_file.rs
View file

@ -1,7 +1,6 @@
use std::{ use std::{
collections::HashSet, collections::HashSet,
fs::{read_to_string, write}, fs::{read_to_string, write},
iter,
path::{Component, Path, PathBuf}, path::{Component, Path, PathBuf},
}; };
@ -185,8 +184,9 @@ pub(crate) fn link<P: AsRef<Path>, Q: AsRef<Path>>(
"script.Parent".to_string() "script.Parent".to_string()
}; };
let path = iter::once(Ok(beginning)) let mut components = path
.chain(path.components().map(|component| { .components()
.map(|component| {
Ok(match component { Ok(match component {
Component::ParentDir => ".Parent".to_string(), Component::ParentDir => ".Parent".to_string(),
Component::Normal(part) => format!( Component::Normal(part) => format!(
@ -195,8 +195,11 @@ pub(crate) fn link<P: AsRef<Path>, Q: AsRef<Path>>(
), ),
_ => unreachable!("invalid path component"), _ => unreachable!("invalid path component"),
}) })
})) })
.collect::<Result<String, LinkingError>>()?; .collect::<Result<Vec<_>, LinkingError>>()?;
components.pop();
let path = beginning + &components.join("") + &format!("[{name:?}]");
debug!( debug!(
"writing linking file for {} with import `{path}` to {}", "writing linking file for {} with import `{path}` to {}",